chore(3p/sources): bump to OpenSSH vulnerability hotfix
See https://github.com/NixOS/nixpkgs/pull/323753 for details. Changes: * git: temporarily comment out dottime patch (it doesn't apply, but it's not critical) * third-party/cgit: use an older git version where dottime patch still applies * 3p/crate2nix: remove crate2nix patches included in latest release * tvix: remove unneeded defaultCrateOverrides (upstreamed to nixpkgs) * tvix: regenerate Cargo.nix * tvix/nix-compat: remove unnused AtermWriteable::aterm_bytes pub(crate) function * tvix/nix-compat: remove redundant trait bounds * tvix/glue: use clone_into() to set drv.{builder,system} * tools/crate2nix: apply workaround for https://github.com/numtide/treefmt/issues/327 * toold/depotfmt: expose treefmt config as passthru * tools/crate2nix: undo some more hacks in the crate2nix-check drv Change-Id: Ifbcedeb3e8f81b2f6ec1dbf10189bfa6dfd9c75c Co-Authored-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/11907 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
parent
17bdf9a574
commit
4b2f3c5454
15 changed files with 124 additions and 230 deletions
|
|
@ -14,22 +14,12 @@ let
|
|||
# Load the crate2nix crate tree.
|
||||
crates = pkgs.callPackage ./Cargo.nix {
|
||||
defaultCrateOverrides = pkgs.defaultCrateOverrides // {
|
||||
opentelemetry-proto = prev: {
|
||||
nativeBuildInputs = protobufDep prev;
|
||||
nix-compat = prev: {
|
||||
src = depot.tvix.utils.filterRustCrateSrc rec {
|
||||
root = prev.src.origSrc;
|
||||
extraFileset = (root + "/testdata");
|
||||
};
|
||||
};
|
||||
|
||||
prost-build = prev: {
|
||||
nativeBuildInputs = protobufDep prev;
|
||||
};
|
||||
|
||||
prost-wkt-types = prev: {
|
||||
nativeBuildInputs = protobufDep prev;
|
||||
};
|
||||
|
||||
tonic-reflection = prev: {
|
||||
nativeBuildInputs = protobufDep prev;
|
||||
};
|
||||
|
||||
tvix-build = prev: {
|
||||
src = depot.tvix.utils.filterRustCrateSrc rec {
|
||||
root = prev.src.origSrc;
|
||||
|
|
@ -91,13 +81,6 @@ let
|
|||
tvix-tracing = prev: {
|
||||
src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
|
||||
nix-compat = prev: {
|
||||
src = depot.tvix.utils.filterRustCrateSrc rec {
|
||||
root = prev.src.origSrc;
|
||||
extraFileset = (root + "/testdata");
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -166,10 +149,12 @@ in
|
|||
# minute or two.
|
||||
cargo metadata > /dev/null
|
||||
|
||||
# running this command counteracts depotfmt brokenness
|
||||
git init
|
||||
|
||||
${depot.tools.crate2nix-generate}/bin/crate2nix-generate
|
||||
${pkgs.crate2nix}/bin/crate2nix generate --all-features
|
||||
${pkgs.treefmt}/bin/treefmt Cargo.nix \
|
||||
--no-cache \
|
||||
--on-unmatched=debug \
|
||||
--config-file=${depot.tools.depotfmt.config} \
|
||||
--tree-root=.
|
||||
|
||||
# technically unnecessary, but provides more-helpful output in case of error
|
||||
diff -ur Cargo.nix ${src}/Cargo.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue