Avoid top-level `with ...;` in pkgs/build-support/replace-dependency.nix

authored by philiptaron.tngl.sh and committed by Valentin Gagarin 7c4a7108 b7bcfbae

+16 -5
+16 -5
pkgs/build-support/replace-dependency.nix
··· 19 # (and all of its dependencies) without rebuilding further. 20 { drv, oldDependency, newDependency, verbose ? true }: 21 22 - with lib; 23 24 - let 25 warn = if verbose then builtins.trace else (x: y: y); 26 references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' 27 (echo { ··· 54 (drv: { name = discard (toString drv); 55 value = elem oldStorepath (referencesOf drv) || 56 any dependsOnOld (referencesOf drv); 57 - }) (builtins.attrNames references)); 58 59 dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; 60 ··· 74 rewriteMemo = listToAttrs (map 75 (drv: { name = discard (toString drv); 76 value = rewriteHashes (builtins.storePath drv) 77 - (filterAttrs (n: v: builtins.elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); 78 }) 79 - (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; 80 81 drvHash = discard (toString drv); 82 in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));
··· 19 # (and all of its dependencies) without rebuilding further. 20 { drv, oldDependency, newDependency, verbose ? true }: 21 22 + let 23 + inherit (lib) 24 + any 25 + attrNames 26 + concatStringsSep 27 + elem 28 + filter 29 + filterAttrs 30 + listToAttrs 31 + mapAttrsToList 32 + stringLength 33 + substring 34 + ; 35 36 warn = if verbose then builtins.trace else (x: y: y); 37 references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' 38 (echo { ··· 65 (drv: { name = discard (toString drv); 66 value = elem oldStorepath (referencesOf drv) || 67 any dependsOnOld (referencesOf drv); 68 + }) (attrNames references)); 69 70 dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; 71 ··· 85 rewriteMemo = listToAttrs (map 86 (drv: { name = discard (toString drv); 87 value = rewriteHashes (builtins.storePath drv) 88 + (filterAttrs (n: v: elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); 89 }) 90 + (filter dependsOnOld (attrNames references))) // rewrittenDeps; 91 92 drvHash = discard (toString drv); 93 in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));