From 88e66ae7f430eba77f1d5794b23a14c7494caa2c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 20 Sep 2009 21:54:20 +0000
Subject: [PATCH] rename mapRecordFlatten to mapAttrsFlatten

svn path=/nixpkgs/trunk/; revision=17315
---
 pkgs/lib/misc.nix                                             | 4 ++--
 .../package-management/nix-repository-manager/default.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 8fe29151976..ba276f4ded7 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -243,8 +243,8 @@ rec {
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
 
   # calls a function (f attr value ) for each record item. returns a list
-  # should be renamed to mapAttrsFlatten
-  mapRecordFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r);
+  mapAttrsFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r);
+  mapRecordFlatten = builtins.trace "depreceated usage of mapRecordFlatten, use mapAttrsFlatten instead" mapAttrsFlatten;
 
   # attribute set containing one attribute
   nvs = name : value : listToAttrs [ (nameValuePair name value) ];
diff --git a/pkgs/tools/package-management/nix-repository-manager/default.nix b/pkgs/tools/package-management/nix-repository-manager/default.nix
index 3275f71090f..29dcb0d2123 100644
--- a/pkgs/tools/package-management/nix-repository-manager/default.nix
+++ b/pkgs/tools/package-management/nix-repository-manager/default.nix
@@ -37,12 +37,12 @@
 
 let
   inherit (builtins) getAttr attrNames;
-  inherit (lib) concatStringsSep mapRecordFlatten;
+  inherit (lib) concatStringsSep mapAttrsFlatten;
   toConfigLine = name : set : 
     "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]";
   config = writeText "nix-repository-manager_config"
         (bleedingEdgeRepos.managedRepoDir+"\n" +
-        concatStringsSep "\n" (mapRecordFlatten toConfigLine (bleedingEdgeRepos.repos)));
+        concatStringsSep "\n" (mapAttrsFlatten toConfigLine (bleedingEdgeRepos.repos)));
 
   cfg = getConfig ["nixRepositoryManager" ] {};