From 96a834d42a1eaf663d5ba6a77fd3045554a77157 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 11 Jan 2013 16:16:20 -0500
Subject: [PATCH] replace-dependency: Better function names

---
 pkgs/build-support/replace-dependency.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix
index b069a64b49c..016845dd754 100644
--- a/pkgs/build-support/replace-dependency.nix
+++ b/pkgs/build-support/replace-dependency.nix
@@ -55,25 +55,25 @@ let
   drv-name = drv:
     discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));
 
-  replace-strings = drv: rewritten-drvs: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } ''
+  rewrite-hashes = drv: hashes: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } ''
     $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${
       concatStringsSep " -e " (mapAttrsToList (name: value:
         "'s|${baseNameOf name}|${baseNameOf value}|g'"
-      ) rewritten-drvs)
+      ) hashes)
     } | $nixStore --restore $out
   '';
 
   rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ];
 
-  fn = drv:
+  rewritten-derivations = drv:
     if depends-on-old drv
       then listToAttrs [ {
         name = discard (toString drv);
 
-        value = replace-strings drv (rewritten-deps // (fold (drv: acc:
-          (fn drv) // acc
+        value = rewrite-hashes drv (rewritten-deps // (fold (drv: acc:
+          (rewritten-derivations drv) // acc
         ) {} (references-of drv)));
       } ]
       else {};
 in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency)));
-getAttr (discard (toString drv)) (fn drv)
+getAttr (discard (toString drv)) (rewritten-derivations drv)