diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-07-09T14·51+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-07-09T16·47+0000 |
| commit | 716f5624fe8ae40f9d135a70140cb5307b800b84 (patch) | |
| tree | 0dc74b5dd5bdc4d67f009a134d2c238148fc80be /tvix/tools/crunch-v2/default.nix | |
| parent | f52b1420354abbde114e11f7dee82e88dc2946d1 (diff) | |
chore(tvix/tools/crunch-v2): Regenerate Cargo.nix and filter src r/8362
The Cargo.lock also got changed because of crate2nix using --freezed. Change-Id: I90245bad27f6fee01455557bbccc865301a4f1a0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11968 Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/tools/crunch-v2/default.nix')
| -rw-r--r-- | tvix/tools/crunch-v2/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tvix/tools/crunch-v2/default.nix b/tvix/tools/crunch-v2/default.nix index 689e86be6559..a3eb25eb9ad6 100644 --- a/tvix/tools/crunch-v2/default.nix +++ b/tvix/tools/crunch-v2/default.nix @@ -1,15 +1,13 @@ -{ pkgs, ... }: +{ pkgs, depot, lib, ... }: -let - crates = import ./Cargo.nix { - inherit pkgs; - nixpkgs = pkgs.path; - - defaultCrateOverrides = pkgs.defaultCrateOverrides // { - crunch-v2 = prev: { - nativeBuildInputs = (prev.nativeBuildInputs or [ ]) ++ [ pkgs.buildPackages.protobuf ]; +(pkgs.callPackage ./Cargo.nix { + defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // { + crunch-v2 = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = lib.fileset.fileFilter (f: f.hasExt "proto") root; }; + nativeBuildInputs = [ pkgs.protobuf ]; }; }; -in -crates.rootCrate.build +}).rootCrate.build |