swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 01:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

invalidateFetcherByDrvHash: Add self-check

Browse source 
... so it won't break when the fetcher doesn't use name correctly.
This commit is contained in:
Robert Hensing 2021-09-29 14:34:24 +02:00
parent 46b3df372e
commit 8e8b3fa1bb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View file

@ -618,7 +618,15 @@ with pkgs;
drvPath = (f args).drvPath;
# It's safe to discard the context, because we don't access the path.
salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath));
in f (args // { name = "${args.name or "source"}-salted-${salt}"; });
# New derivation incorporating the original drv hash in the name
salted = f (args // { name = "${args.name or "source"}-salted-${salt}"; });
# Make sure we did change the derivation. If the fetcher ignores `name`,
# `invalidateFetcherByDrvHash` doesn't work.
checked =
if salted.drvPath == drvPath
then throw "invalidateFetcherByDrvHash: Adding the derivation hash to the fixed-output derivation name had no effect. Make sure the fetcher's name argument ends up in the derivation name. Otherwise, the fetcher will not be re-run when its implementation changes. This is important for testing."
else salted;
in checked;
lazydocker = callPackage ../tools/misc/lazydocker { };