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

Remove obsolete flattenAttrs function

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-13 18:26:19 -04:00
parent 8225460f82
commit 4f7917ac62
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/lib/lists.nix
View File

@ -212,7 +212,7 @@ rec {
let loop = l: if tail l == [] then head l else loop (tail l); in let loop = l: if tail l == [] then head l else loop (tail l); in
loop list; loop list;
# Zip two lists together. # Zip two lists together.
zipTwoLists = xs: ys: zipTwoLists = xs: ys:
if xs != [] && ys != [] then if xs != [] && ys != [] then

6
pkgs/lib/misc.nix
View File

@ -322,10 +322,6 @@ rec {
// listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ])
; ;
# returns atribute values as a list
flattenAttrs = set : map ( attr : builtins.getAttr attr set) (attrNames set);
mapIf = cond : f : fold ( x : l : if (cond x) then [(f x)] ++ l else l) [];
# prepareDerivationArgs tries to make writing configurable derivations easier # prepareDerivationArgs tries to make writing configurable derivations easier
# example: # example:
# prepareDerivationArgs { # prepareDerivationArgs {
@ -365,7 +361,7 @@ rec {
flagName = name : "${name}Support"; flagName = name : "${name}Support";
cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags)))
// args2.cfg; // args2.cfg;
opts = flattenAttrs (mapAttrs (a : v : opts = attrValues (mapAttrs (a : v :
let v2 = if (v ? set || v ? unset) then v else { set = v; }; let v2 = if (v ? set || v ? unset) then v else { set = v; };
n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset";
attr = maybeAttr n {} v2; in attr = maybeAttr n {} v2; in