diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-03-21 23:17:17 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-03-21 23:17:17 +0100 |
| commit | 6c469679f6dea7f0cefafcac7e9d95b98bf8ff55 (patch) | |
| tree | 6de0ea4d1a193ee43b145645ab75b65dcfb597e8 /lib/default.nix | |
| parent | b2d3baa3cf5d8650401d0e4b0d27284e084a1e52 (diff) | |
| parent | ae1a4700452ff572082a05dceba635f04367288d (diff) | |
Merge remote-tracking branch 'upstream/master' into tests-restrict-arguments
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix index 2d231bbd2d92c..0e94e821bea50 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 toFunction toHexString toBaseDigits; @@ -79,9 +79,10 @@ let mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil - recursiveUpdate matchAttrs overrideExisting getOutput getBin + recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip - recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets; + recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets + updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists @@ -120,7 +121,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 |