summary refs log tree commit diff
path: root/lib/default.nix
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2020-03-01 11:05:34 +0100
committerGitHub <noreply@github.com>2020-03-01 11:05:34 +0100
commite38a01db5d8afe312d684e8c2ddbdb4e11d9307f (patch)
tree8e57912a3d467cbaab77fd558fdc7f71230734ab /lib/default.nix
parent02ca096a85eced0d653004ae95f7cc6d8597b13e (diff)
parenta96f37db10fb2892d0420a7ef51c5b157d9e58dd (diff)
downloadnixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar.gz
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar.bz2
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar.lz
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar.xz
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.tar.zst
nixpkgs-e38a01db5d8afe312d684e8c2ddbdb4e11d9307f.zip
Merge pull request #68491 from roberth/fix-dontRecurseIntoAttrs
Fix dontRecurseIntoAttrs + add to lib + doc
Diffstat (limited to 'lib/default.nix')
-rw-r--r--lib/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix
index d2fe018aa6a..f8cc5c4d816 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -73,7 +73,8 @@ let
       genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
       recursiveUpdate matchAttrs overrideExisting getOutput getBin
-      getLib getDev chooseDevOutputs zipWithNames zip;
+      getLib getDev chooseDevOutputs zipWithNames zip
+      recurseIntoAttrs dontRecurseIntoAttrs;
     inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists