diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2022-03-21 10:10:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 10:10:40 -0400 |
| commit | 8ce16fcf62095c4a0faab25f27dc3698214ad6c6 (patch) | |
| tree | 2885b15250fc611a913d12b929406050a5508c90 /lib/default.nix | |
| parent | 84569e8d3c6927afdd942c19be415fa5a6dfa864 (diff) | |
| parent | 1eb627c4cf62f50b647d2bf287d1ea97e326539f (diff) | |
| download | nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar.gz nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar.bz2 nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar.lz nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar.xz nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.tar.zst nixpkgs-8ce16fcf62095c4a0faab25f27dc3698214ad6c6.zip | |
Merge pull request #163451 from hercules-ci/stop-premature-warnings
Stop premature warnings, including `nix.settings` migration
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index f8ab51c6579..6f7930c5343 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -67,7 +67,7 @@ let inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn warnIf throwIfNot checkListOfEnum - info showWarnings nixpkgsVersion version + info showWarnings nixpkgsVersion version isInOldestRelease mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions @@ -120,7 +120,8 @@ let mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule - mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule + mkRenamedOptionModule mkRenamedOptionModuleWith + mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule mkDerivedConfig doRename; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption |