diff options
author | Naïm Favier <n@monade.li> | 2022-12-02 13:39:47 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-02 14:15:24 +0100 |
commit | e8927c46b8693b1d0b1d6e12cd602c6647217d3a (patch) | |
tree | f742957d53cbcbdee782de8966dadde425d21001 /lib/modules.nix | |
parent | 3dc19ce82d5a435ff63a2d8771aaf4a8243f0c0f (diff) | |
download | nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar.gz nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar.bz2 nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar.lz nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar.xz nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.tar.zst nixlib-e8927c46b8693b1d0b1d6e12cd602c6647217d3a.zip |
nixos/doc: document `mkOrder` and friends
Add a section on ordering option definitions. Also mention `mkDefault` in the section on `mkOverride`. Clarify the code a bit by renaming `defaultPriority` to `defaultOverridePriority` and introducing `defaultOrderPriority`.
Diffstat (limited to 'lib/modules.nix')
-rw-r--r-- | lib/modules.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 204a2cc1ac12..f5e69ad4bcf5 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -833,7 +833,7 @@ rec { filterOverrides' = defs: let - 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 defaultOverridePriority; 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; in { @@ -842,7 +842,7 @@ rec { }; /* Sort a list of properties. The sort priority of a property is - 1000 by default, but can be overridden by wrapping the property + defaultOrderPriority by default, but can be overridden by wrapping the property using mkOrder. */ sortProperties = defs: let @@ -851,7 +851,7 @@ rec { then def // { value = def.value.content; inherit (def.value) priority; } else def; defs' = map strip defs; - compare = a: b: (a.priority or 1000) < (b.priority or 1000); + compare = a: b: (a.priority or defaultOrderPriority) < (b.priority or defaultOrderPriority); in sort compare defs'; # This calls substSubModules, whose entire purpose is only to ensure that @@ -887,10 +887,13 @@ rec { mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default + defaultOverridePriority = 100; mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ + defaultPriority = lib.warnIf (lib.isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority; + mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; mkOrder = priority: content: @@ -899,11 +902,9 @@ rec { }; mkBefore = mkOrder 500; + defaultOrderPriority = 1000; 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 # properties from one option to another. This property is useful for # renaming options, and also for including properties from another module @@ -930,10 +931,10 @@ rec { # Similar to mkAliasAndWrapDefinitions but copies over the priority from the # option as well. # - # If a priority is not set, it assumes a priority of defaultPriority. + # If a priority is not set, it assumes a priority of defaultOverridePriority. mkAliasAndWrapDefsWithPriority = wrap: option: let - prio = option.highestPrio or defaultPriority; + prio = option.highestPrio or defaultOverridePriority; defsWithPrio = map (mkOverride prio) option.definitions; in mkAliasIfDef option (wrap (mkMerge defsWithPrio)); @@ -1115,7 +1116,7 @@ rec { # to definitions. mkDerivedConfig = opt: f: mkOverride - (opt.highestPrio or defaultPriority) + (opt.highestPrio or defaultOverridePriority) (f opt.value); doRename = { from, to, visible, warn, use, withPriority ? true }: |