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

replace-dependency.nix: Use dynamic attrs now.

Browse Source
This commit is contained in:
Shea Levy 2015-11-16 05:42:27 -05:00
parent 782cfe94b0
commit afaf712ee7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ let
oldStorepath = builtins.storePath (discard (toString oldDependency)); oldStorepath = builtins.storePath (discard (toString oldDependency));
referencesOf = drv: getAttr (discard (toString drv)) references; referencesOf = drv: references.${discard (toString drv)};
dependsOnOldMemo = listToAttrs (map dependsOnOldMemo = listToAttrs (map
(drv: { name = discard (toString drv); (drv: { name = discard (toString drv);
@ -56,7 +56,7 @@ let
any dependsOnOld (referencesOf drv); any dependsOnOld (referencesOf drv);
}) (builtins.attrNames references)); }) (builtins.attrNames references));
dependsOnOld = drv: getAttr (discard (toString drv)) dependsOnOldMemo; dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)};
drvName = drv: drvName = drv:
discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));
@ -78,7 +78,6 @@ let
}) })
(filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps;
attr = discard (toString drv);
in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));
if hasAttr (discard (toString drv)) rewriteMemo rewriteMemo.${attr} or (warn "replace-dependency.nix: Derivation ${attr} does not depend on ${discard (toString oldDependency)}\n" drv)
then getAttr (discard (toString drv)) rewriteMemo
else warn "replace-dependency.nix: derivation ${discard (toString drv)} does not depend on ${discard (toString oldDependency)}\n" drv