diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-23 00:09:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 00:09:33 +0000 |
| commit | e8122c362847810d168dcc2a8c9153e6008d1d14 (patch) | |
| tree | 0669e63e44d83d0b9bb8ccf1ea320940751900d2 /lib | |
| parent | b607aadaac36e77ff58303d199ae4f77227e41f3 (diff) | |
| parent | 959c4e82bc0972bae00f1501821812a7f27e1956 (diff) | |
| download | nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar.gz nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar.bz2 nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar.lz nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar.xz nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.tar.zst nixpkgs-e8122c362847810d168dcc2a8c9153e6008d1d14.zip | |
Merge master into staging-next
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; |