diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-07-12 07:23:45 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-07-12 07:25:52 +0200 |
| commit | 99bc203025a0ff1265eedc6ff3d6c7aa1f320c09 (patch) | |
| tree | 9919c8784dc18b4afda1274226b3b11741ebd9ae /lib | |
| parent | 1657d1a4aae5e77a84e08c610f0a32de4b79c28a (diff) | |
| download | nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar.gz nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar.bz2 nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar.lz nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar.xz nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.tar.zst nixpkgs-99bc203025a0ff1265eedc6ff3d6c7aa1f320c09.zip | |
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 8fb9984690c878fcd768e967190957441de05d11.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 4 | ||||
| -rw-r--r-- | lib/modules.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index ccfee2ebe30..ccae0bbc3ab 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -115,8 +115,8 @@ let mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride - mkOptionDefault mkDefault mkForce mkVMOverride - mkOrder mkBefore mkAfter mkAliasDefinitions + mkOptionDefault mkDefault mkForce mkVMOverride mkStrict + mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule doRename; diff --git a/lib/modules.nix b/lib/modules.nix index 58c6cda58e4..99b9a8a31ea 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -713,6 +713,10 @@ rec { mkForce = mkOverride 50; 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: { _type = "order"; inherit priority content; |