summary refs log tree commit diff
path: root/lib/attrsets.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2019-09-11 13:03:48 +0200
committerRobert Hensing <robert@roberthensing.nl>2019-09-11 13:12:06 +0200
commitfc64cf65abfd6f42910a639f7ffb996788a95797 (patch)
tree3d4bf11fd2d59eb471682e8dd81a93af1a2244a5 /lib/attrsets.nix
parent8935bfb4ac3680e38a8811c12282e2026f7e82ae (diff)
downloadnixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar.gz
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar.bz2
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar.lz
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar.xz
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.tar.zst
nixpkgs-fc64cf65abfd6f42910a639f7ffb996788a95797.zip
top-level: Fix dontRecurseIntoAttrs and include in lib
dontRecurseIntoAttrs was a noop (x: x), causing the expression
dontRecurseIntoAttrs (recurseIntoAttrs a) to have the wrong effect.
Diffstat (limited to 'lib/attrsets.nix')
-rw-r--r--lib/attrsets.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 4b73735fd85..607a22393f8 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -479,6 +479,11 @@ rec {
   recurseIntoAttrs =
     attrs: attrs // { recurseForDerivations = true; };
 
+  /* Undo the effect of recurseIntoAttrs.
+   */
+  dontRecurseIntoAttrs =
+    attrs: attrs // { recurseForDerivations = false; };
+
   /*** deprecated stuff ***/
 
   zipWithNames = zipAttrsWithNames;