public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename mapRecordFlatten to mapAttrsFlatten

Browse Source 
svn path=/nixpkgs/trunk/; revision=17315
This commit is contained in:
Marc Weber 2009-09-20 21:54:20 +00:00
parent 47a2c768f9
commit 88e66ae7f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/misc.nix
View File

@ -243,8 +243,8 @@ rec {
closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
# calls a function (f attr value ) for each record item. returns a list # calls a function (f attr value ) for each record item. returns a list
# should be renamed to mapAttrsFlatten mapAttrsFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r);
mapRecordFlatten = 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 # attribute set containing one attribute
nvs = name : value : listToAttrs [ (nameValuePair name value) ]; nvs = name : value : listToAttrs [ (nameValuePair name value) ];

4
pkgs/tools/package-management/nix-repository-manager/default.nix
View File

@ -37,12 +37,12 @@
let let
inherit (builtins) getAttr attrNames; inherit (builtins) getAttr attrNames;
inherit (lib) concatStringsSep mapRecordFlatten; inherit (lib) concatStringsSep mapAttrsFlatten;
toConfigLine = name : set : toConfigLine = name : set :
"[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]"; "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]";
config = writeText "nix-repository-manager_config" config = writeText "nix-repository-manager_config"
(bleedingEdgeRepos.managedRepoDir+"\n" + (bleedingEdgeRepos.managedRepoDir+"\n" +
concatStringsSep "\n" (mapRecordFlatten toConfigLine (bleedingEdgeRepos.repos))); concatStringsSep "\n" (mapAttrsFlatten toConfigLine (bleedingEdgeRepos.repos)));
cfg = getConfig ["nixRepositoryManager" ] {}; cfg = getConfig ["nixRepositoryManager" ] {};