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

Export only the files of the active definitions

This commit is contained in:
Eelco Dolstra 2013-10-30 12:10:40 +01:00
parent ac68d326b9
commit c7f7ceefd6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/modules.nix
View File

@ -153,6 +153,7 @@ rec {
# value specified in the option declaration (if any). # value specified in the option declaration (if any).
defsFinal = filterOverrides' defsFinal = filterOverrides'
((if opt ? default then [{ file = head opt.declarations; value = mkOptionDefault opt.default; }] else []) ++ defs); ((if opt ? default then [{ file = head opt.declarations; value = mkOptionDefault opt.default; }] else []) ++ defs);
files = map (def: def.file) defsFinal;
# Type-check the remaining definitions, and merge them if # Type-check the remaining definitions, and merge them if
# possible. # possible.
merged = merged =
@ -162,16 +163,16 @@ rec {
fold (def: res: fold (def: res:
if opt.type.check def.value then res if opt.type.check def.value then res
else throw "The option value `${showOption loc}' in `${def.file}' is not a ${opt.type.name}.") else throw "The option value `${showOption loc}' in `${def.file}' is not a ${opt.type.name}.")
(opt.type.merge { prefix = loc; files = map (m: m.file) defsFinal; } (map (m: m.value) defsFinal)) defsFinal; (opt.type.merge { prefix = loc; inherit files; } (map (m: m.value) defsFinal)) defsFinal;
# Finally, apply the ‘apply’ function to the merged # Finally, apply the ‘apply’ function to the merged
# value. This allows options to yield a value computed # value. This allows options to yield a value computed
# from the definitions. # from the definitions.
value = (opt.apply or id) merged; value = (opt.apply or id) merged;
in opt // in opt //
{ value = addErrorContext "while evaluating the option `${showOption loc}':" value; { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
files = map (def: def.file) defs;
definitions = map (def: def.value) defsFinal; definitions = map (def: def.value) defsFinal;
isDefined = defsFinal != []; isDefined = defsFinal != [];
inherit files;
}; };
/* Given a config set, expand mkMerge properties, and push down the /* Given a config set, expand mkMerge properties, and push down the