diff options
Diffstat (limited to 'tvix/default.nix')
| -rw-r--r-- | tvix/default.nix | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index a181484286e9..bfa02e72d216 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -14,22 +14,12 @@ let # Load the crate2nix crate tree. crates = pkgs.callPackage ./Cargo.nix { defaultCrateOverrides = pkgs.defaultCrateOverrides // { - opentelemetry-proto = prev: { - nativeBuildInputs = protobufDep prev; - }; - - prost-build = prev: { - nativeBuildInputs = protobufDep prev; - }; - - prost-wkt-types = prev: { - nativeBuildInputs = protobufDep prev; - }; - - tonic-reflection = prev: { - nativeBuildInputs = protobufDep prev; + nix-compat = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = (root + "/testdata"); + }; }; - 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 |