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

Support mkOverride in non-leaf nodes

This commit is contained in:
Eelco Dolstra 2013-10-28 17:46:45 +01:00
parent 1367074940
commit 1b2006270f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/modules.nix
View File

@ -125,7 +125,6 @@ rec {
if opt.options ? default && res ? default || if opt.options ? default && res ? default ||
opt.options ? example && res ? example || opt.options ? example && res ? example ||
opt.options ? description && res ? description || opt.options ? description && res ? description ||
opt.options ? merge && res ? merge || # FIXME: remove merge
opt.options ? apply && res ? apply || opt.options ? apply && res ? apply ||
opt.options ? type && res ? type opt.options ? type && res ? type
then then
@ -185,8 +184,9 @@ rec {
concatMap pushDownProperties cfg.contents concatMap pushDownProperties cfg.contents
else if cfg._type or "" == "if" then else if cfg._type or "" == "if" then
map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content) map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
else if cfg._type or "" == "override" then
map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
else else
# FIXME: handle mkOverride?
[ cfg ]; [ cfg ];
/* Given a config value, expand mkMerge properties, and discharge /* Given a config value, expand mkMerge properties, and discharge