diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-31T08·30+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-10-31T12·11+0000 |
| commit | ea92ba788c9eec9e9683fd06c7dd47fb3133155d (patch) | |
| tree | 69cdaabd87837e5f9f29b4e723e5bdd8d4de55ed /third_party/overlays | |
| parent | 54def82825702857b11101b1dc803e53f529ba00 (diff) | |
chore(third_party/overlay): use crate2nix upstream r/6918
Apply the patch that didn't land using `patches`. Change-Id: Id87675cd44123eea8cc2175efe04f61421f26f37 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9886 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: edef <edef@edef.eu> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays')
| -rw-r--r-- | third_party/overlays/tvl.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 7f67c80859..124756fd18 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -108,27 +108,13 @@ depot.nix.readTree.drvTargets { }; })); - # Pin a newer version of crate2nix from git, which is not officially - # released but supports `dep:` and conditional features + # Apply a patch to run tests in debug, not release mode. crate2nix = super.crate2nix.overrideAttrs (old: rec { - version = "unstable-2023-09-26"; - - src = self.fetchFromGitHub { - owner = "nix-community"; - repo = "crate2nix"; - rev = "8a33aec8795dcc98afbb0cd1030bb1c939ede211"; - hash = "sha256-eFT2SUxTopxEvW0rcxSjQU6nbrQLI2FbyaVgtV8oiTk="; - }; - patches = old.patches ++ [ # run tests in debug mode, not release mode + # https://github.com/nix-community/crate2nix/pull/301 ./patches/crate2nix-tests-debug.patch ]; - - cargoDeps = old.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "1ny4z06dy6zc3373x1a8pbzzv3jb52mpwn2g1nkr67pmfdq2b0q7"; - }); }); evans = super.evans.overrideAttrs (old: { |