diff options
| author | volth <volth@webmaster.ms> | 2018-12-18 17:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 17:13:27 +0000 |
| commit | fed7914539d6afaae6bb6f18197d060a74944173 (patch) | |
| tree | 7923f6246d22e9a93365debb4b9d3bea6b6349ec /lib/default.nix | |
| parent | bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (diff) | |
| parent | 1148ce1b601fd0e64088458014cecd08bc2b8e1e (diff) | |
| download | nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar.gz nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar.bz2 nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar.lz nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar.xz nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.tar.zst nixpkgs-fed7914539d6afaae6bb6f18197d060a74944173.zip | |
Merge branch 'staging' into make-perl-pathd
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index aff36d0e5c2..ee10ec1448b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -61,10 +61,10 @@ let boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; - inherit (fixedPoints) fix fix' extends composeExtensions + inherit (fixedPoints) fix fix' converge extends composeExtensions makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath - getAttrFromPath attrVals attrValues catAttrs filterAttrs + getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs |