diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:25:07 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:25:07 +0000 |
| commit | d0d5136cce5e0cbe2305c53090bd4bd886114746 (patch) | |
| tree | 70092947536a3c65e215df9df20e571e34652f7a /lib/default.nix | |
| parent | 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca (diff) | |
| parent | 195c263a812dec532656dcfd5d0360458cdc93fd (diff) | |
| download | nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar.gz nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar.bz2 nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar.lz nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar.xz nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.tar.zst nixpkgs-d0d5136cce5e0cbe2305c53090bd4bd886114746.zip | |
Merge remote-tracking branch 'upstream/master' into wrapper-pname-support
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index 0e840dd6c9e..8af53152586 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -57,8 +57,8 @@ let hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; - inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot - boolToString mergeAttrs flip mapNullable inNixShell min max + 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; inherit (fixedPoints) fix fix' converge extends composeExtensions @@ -135,5 +135,7 @@ let mergeAttrsByFuncDefaultsClean mergeAttrBy fakeSha256 fakeSha512 nixType imap; + inherit (versions) + splitVersion; }); in lib |