From 94e68bf9ee7335e0e36d993b10fe096ac04de809 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 16 Nov 2015 17:44:03 -0500 Subject: [PATCH] replace-dependency.nix: Give attr a slightly more meaningful name of drvHash --- pkgs/build-support/replace-dependency.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 1a1c1a113ea2..c8794c6eea1e 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -78,6 +78,6 @@ let }) (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; - attr = discard (toString drv); + drvHash = discard (toString drv); 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)