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

Rename mergeDefinitions internal steps to functions which are independent of each others.

This commit is contained in:
Nicolas B. Pierron 2015-03-12 22:38:51 +01:00
parent 83dc60456e
commit dd4f5f6b78
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/modules.nix
View File

@ -274,20 +274,21 @@ rec {
defsFinal =
let
# Process mkMerge and mkIf properties
discharged = concatMap (m:
processIfAndMerge = defs: concatMap (m:
map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
) defs;
# Process mkOverride properties
overridden = filterOverrides discharged;
processOverride = defs: filterOverrides defs;
# Sort mkOrder properties
sorted =
processOrder = defs:
# Avoid sorting if we don't have to.
if any (def: def.value._type or "" == "order") overridden
then sortProperties overridden
else overridden;
in sorted;
if any (def: def.value._type or "" == "order") defs
then sortProperties defs
else defs;
in
processOrder (processOverride (processIfAndMerge defs));
# Type-check the remaining definitions, and merge them
mergedValue = fold (def: res: