b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unused feature which allowed to add properties on the required elements.

Browse source 
svn path=/nixpkgs/trunk/; revision=15658
This commit is contained in:
Nicolas Pierron 2009-05-19 23:07:02 +00:00
parent 36dcabd7be
commit 47679b20af
1 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/lib/options.nix
View file

@ -194,37 +194,11 @@ rec {
getRequire = x:
toList (getAttr ["require"] [] (preprocess x));
getCleanRequire = x: map rmProperties (getRequire x);
rmRequire = x: removeAttrs (preprocess x) ["require"];
duplicateIncludeProperties = list:
# iterate on all configurations
fold (cfg: l:
# iterate on all imported configuration from cfg
fold (include: l:
# clean up the included cfg to get the same result
let includedCfg = rmProperties include; in
# if the include has properties
if include != includedCfg then
# iterate on all configurations
map (cfg:
# if the imported configuration is seen
if (rmProperties cfg) == includedCfg then
# copy the properties from the import to the configuration.
delayProperties (copyProperties include cfg)
else
cfg
) l
else
l
) l (getRequire cfg)
) list list;
in
merge "" (
map rmRequire (
duplicateIncludeProperties (
lib.uniqFlatten getCleanRequire [] [] (toList opts)
)
lib.uniqFlatten getRequire [] [] (toList opts)
)
);