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