diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-06-23 00:48:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 00:48:59 +0200 |
| commit | b3e9073c48c6cc4355eb5af88df0e4c6062be9d7 (patch) | |
| tree | 4ca690d33dbe63644993de770535a9e92b5c6c84 /lib | |
| parent | a3d3ec2ec7742f8ef6f560cfb2837cb4ec0caf30 (diff) | |
| parent | 8fb9984690c878fcd768e967190957441de05d11 (diff) | |
| download | nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar.gz nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar.bz2 nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar.lz nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar.xz nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.tar.zst nixpkgs-b3e9073c48c6cc4355eb5af88df0e4c6062be9d7.zip | |
Merge pull request #125991 from helsinki-systems/drop/mkStrict
lib/modules: Drop mkStrict and mkFixStrictness
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 4 | ||||
| -rw-r--r-- | lib/modules.nix | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/default.nix b/lib/default.nix index ccae0bbc3ab..ccfee2ebe30 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 mkStrict - mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions + mkOptionDefault mkDefault mkForce mkVMOverride + mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule doRename; diff --git a/lib/modules.nix b/lib/modules.nix index 99b9a8a31ea..58c6cda58e4 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -713,10 +713,6 @@ 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; |