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

* Fix a comparison of function values (disallowed in the Nix trunk).

Browse Source 
Thanks to Nicolas.

svn path=/nixpkgs/trunk/; revision=15734
This commit is contained in:
Eelco Dolstra 2009-05-26 16:00:30 +00:00
parent 3c21e81203
commit 8b52e84e1a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/lib/options.nix
View File

@ -194,16 +194,16 @@ rec {
in cfg3; in cfg3;
getRequire = x: toList (attrByPath ["require"] [] (preprocess x)); getRequire = x: toList (attrByPath ["require"] [] (preprocess x));
getRecusiveRequire = x: getRecursiveRequire = x:
fold (cfg: l: fold (cfg: l:
if isPath cfg then if isPath cfg then
[ cfg ] ++ l [ cfg ] ++ l
else else
[ cfg ] ++ (getRecusiveRequire cfg) ++ l [ cfg ] ++ (getRecursiveRequire cfg) ++ l
) [] (getRequire x); ) [] (getRequire x);
getRequireSets = x: filter (x: ! isPath x) (getRecusiveRequire x); getRequireSets = x: filter (x: ! isPath x) (getRecursiveRequire x);
getRequirePaths = x: filter isPath (getRecusiveRequire x); getRequirePaths = x: filter isPath (getRecursiveRequire x);
rmRequire = x: removeAttrs (preprocess x) ["require"]; rmRequire = x: removeAttrs (preprocess x) ["require"];
inlineRequiredSets = cfgs: inlineRequiredSets = cfgs:
@ -211,9 +211,7 @@ rec {
in in
merge "" ( merge "" (
map rmRequire ( map rmRequire (
inlineRequiredSets ( inlineRequiredSets ((toList opts) ++ lib.uniqFlatten getRequirePaths [] [] (lib.concatMap getRequirePaths (toList opts)))
lib.uniqFlatten getRequirePaths [] [] (toList opts)
)
) )
); );