diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
| commit | 5581b5521e14317c3507a6e8451a3f14996e5c4d (patch) | |
| tree | 7aadee5a9ef5d6e2acc8929818c6eb2d2099e2ae /nixpkgs/lib/default.nix | |
| parent | de94c6c62e2f86b3667386a42690d6bb376a2f58 (diff) | |
| parent | 8e2b14aceb1d40c7e8b84c03a7c78955359872bb (diff) | |
Merge commit '8e2b14aceb1d40c7e8b84c03a7c78955359872bb'
Diffstat (limited to 'nixpkgs/lib/default.nix')
| -rw-r--r-- | nixpkgs/lib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index e7f59a67abb..43b9ab5930c 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -67,7 +67,7 @@ let inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info showWarnings nixpkgsVersion version mod compare - splitByAndCompare functionArgs setFunctionArgs isFunction; + splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (fixedPoints) fix fix' converge extends composeExtensions makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath @@ -77,7 +77,7 @@ let genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin - getLib getDev chooseDevOutputs zipWithNames zip + getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs; inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count |