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

lib/modules: deprecate 'mkAliasIfDef' (#470154)

Browse Source
This commit is contained in:
Robert Hensing
2026-04-07 09:05:53 +00:00
committed by GitHub
parent 8931f21ff5 6ca8927eb0
commit ffe82c6a3c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/modules.nix
+5 -3
View File
@@ -1582,7 +1582,7 @@ let
# mkDefault properties of the previous option.
#
mkAliasDefinitions = mkAliasAndWrapDefinitions id;
mkAliasAndWrapDefinitions = wrap: option: mkAliasIfDef option (wrap (mkMerge option.definitions));
mkAliasAndWrapDefinitions = wrap: option: mkIf option.isDefined (wrap (mkMerge option.definitions));
# Similar to mkAliasAndWrapDefinitions but copies over the priority from the
# option as well.
@@ -1594,9 +1594,11 @@ let
prio = option.highestPrio or defaultOverridePriority;
defsWithPrio = map (mkOverride prio) option.definitions;
in
mkAliasIfDef option (wrap (mkMerge defsWithPrio));
mkIf option.isDefined (wrap (mkMerge defsWithPrio));
mkAliasIfDef = option: mkIf (isOption option && option.isDefined);
mkAliasIfDef =
lib.warn "Usage of 'mkAliasIfDef' has been deprecated. Use 'mkIf option.isDefined' instead."
(option: mkIf option.isDefined);
/**
Compatibility.