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

* options.nix:

Browse Source 
Remove attribute set comparison.  Imported attribute sets
        are traverse assuming that no duplicate could exists.

svn path=/nixpkgs/trunk/; revision=15659
This commit is contained in:
Nicolas Pierron 2009-05-19 23:07:07 +00:00
parent 47679b20af
commit 1500252e6f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/lib/options.nix
View File

@ -146,6 +146,7 @@ rec {
|| builtins.isList x || builtins.isList x
); );
# Evaluate a list of option sets that would be merged with the # Evaluate a list of option sets that would be merged with the
# function "merge" which expects two arguments. The attribute named # function "merge" which expects two arguments. The attribute named
# "require" is used to imports option declarations and bindings. # "require" is used to imports option declarations and bindings.
@ -192,13 +193,27 @@ rec {
cfg3 = noImportConditions cfg2; cfg3 = noImportConditions cfg2;
in cfg3; in cfg3;
getRequire = x: getRequire = x: toList (getAttr ["require"] [] (preprocess x));
toList (getAttr ["require"] [] (preprocess x)); getRecusiveRequire = x:
fold (cfg: l:
if isPath cfg then
[ cfg ] ++ l
else
[ cfg ] ++ (getRecusiveRequire cfg) ++ l
) [] (getRequire x);
getRequireSets = x: filter (x: ! isPath x) (getRecusiveRequire x);
getRequirePaths = x: filter isPath (getRecusiveRequire x);
rmRequire = x: removeAttrs (preprocess x) ["require"]; rmRequire = x: removeAttrs (preprocess x) ["require"];
inlineRequiredSets = cfgs:
fold (cfg: l: [ cfg ] ++ (getRequireSets cfg) ++ l) [] cfgs;
in in
merge "" ( merge "" (
map rmRequire ( map rmRequire (
lib.uniqFlatten getRequire [] [] (toList opts) inlineRequiredSets (
lib.uniqFlatten getRequirePaths [] [] (toList opts)
)
) )
); );