public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace-dependency.nix: Give attr a slightly more meaningful name of drvHash

Browse Source
This commit is contained in:
Russell O'Connor 2015-11-16 17:44:03 -05:00 committed by Russell O'Connor
parent afaf712ee7
commit 94e68bf9ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/replace-dependency.nix
View File

@ -78,6 +78,6 @@ let
}) })
(filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps;
attr = discard (toString drv); drvHash = discard (toString drv);
in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));
rewriteMemo.${attr} or (warn "replace-dependency.nix: Derivation ${attr} does not depend on ${discard (toString oldDependency)}\n" drv) rewriteMemo.${drvHash} or (warn "replace-dependency.nix: Derivation ${drvHash} does not depend on ${discard (toString oldDependency)}\n" drv)