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

Pull out defaultPriority to a top-level definition.

This commit is contained in:
(cdep)illabout 2019-01-06 17:48:37 +09:00
parent b81b3ad1b0
commit f24e2d0721
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/modules.nix
View File

@ -450,8 +450,7 @@ rec {
filterOverrides' = defs: filterOverrides' = defs:
let let
defaultPrio = 100; getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPriority;
getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
in { in {
@ -534,6 +533,8 @@ rec {
mkBefore = mkOrder 500; mkBefore = mkOrder 500;
mkAfter = mkOrder 1500; mkAfter = mkOrder 1500;
# The default priority for things that don't have a priority specified.
defaultPriority = 100;
# Convenient property used to transfer all definitions and their # Convenient property used to transfer all definitions and their
# properties from one option to another. This property is useful for # properties from one option to another. This property is useful for
@ -561,11 +562,10 @@ rec {
# Similar to mkAliasAndWrapDefinitions but copies over the priority from the # Similar to mkAliasAndWrapDefinitions but copies over the priority from the
# option as well. # option as well.
# #
# If a priority is not set, it assumes a priority of 100. # If a priority is not set, it assumes a priority of defaultPriority.
mkAliasAndWrapDefsWithPriority = wrap: option: mkAliasAndWrapDefsWithPriority = wrap: option:
let let
defaultPrio = 100; prio = option.highestPrio or defaultPriority;
prio = option.highestPrio or defaultPrio;
defsWithPrio = map (mkOverride prio) option.definitions; defsWithPrio = map (mkOverride prio) option.definitions;
in mkAliasIfDef option (wrap (mkMerge defsWithPrio)); in mkAliasIfDef option (wrap (mkMerge defsWithPrio));