Partially revert "lib/modules: Drop mkStrict and mkFixStrictness"
mkFixStrictness was never properly deprecated and should only be
removed after warning for some time.
This partially reverts commit 8fb9984690
.
This commit is contained in:
parent
1657d1a4aa
commit
99bc203025
|
@ -115,8 +115,8 @@ let
|
||||||
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
|
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
|
||||||
pushDownProperties dischargeProperties filterOverrides
|
pushDownProperties dischargeProperties filterOverrides
|
||||||
sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
|
sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
|
||||||
mkOptionDefault mkDefault mkForce mkVMOverride
|
mkOptionDefault mkDefault mkForce mkVMOverride mkStrict
|
||||||
mkOrder mkBefore mkAfter mkAliasDefinitions
|
mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
|
||||||
mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
|
mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
|
||||||
mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
|
mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
|
||||||
mkAliasOptionModule doRename;
|
mkAliasOptionModule doRename;
|
||||||
|
|
|
@ -713,6 +713,10 @@ rec {
|
||||||
mkForce = mkOverride 50;
|
mkForce = mkOverride 50;
|
||||||
mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
|
mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
|
||||||
|
|
||||||
|
mkStrict = builtins.trace "`mkStrict' is obsolete; use `mkOverride 0' instead." (mkOverride 0);
|
||||||
|
|
||||||
|
mkFixStrictness = id; # obsolete, no-op
|
||||||
|
|
||||||
mkOrder = priority: content:
|
mkOrder = priority: content:
|
||||||
{ _type = "order";
|
{ _type = "order";
|
||||||
inherit priority content;
|
inherit priority content;
|
||||||
|
|
Loading…
Reference in a new issue