diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-07-12 07:31:20 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-07-12 07:31:29 +0200 |
| commit | cad20d8983a547c19e914ec5a2a6093b0c8e5a16 (patch) | |
| tree | 3513c348618af0034ad5496e387a821bd6685f41 /lib | |
| parent | 99bc203025a0ff1265eedc6ff3d6c7aa1f320c09 (diff) | |
| download | nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar.gz nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar.bz2 nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar.lz nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar.xz nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.tar.zst nixpkgs-cad20d8983a547c19e914ec5a2a6093b0c8e5a16.zip | |
lib.mkFixStrictness: Deprecate
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/modules.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix index ccae0bbc3ab..8e29ef5c420 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -115,7 +115,7 @@ let mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride - mkOptionDefault mkDefault mkForce mkVMOverride mkStrict + mkOptionDefault mkDefault mkForce mkVMOverride mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule diff --git a/lib/modules.nix b/lib/modules.nix index 99b9a8a31ea..ab2bc4f7f8e 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -713,9 +713,7 @@ 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 + 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: { _type = "order"; |