From fc64cf65abfd6f42910a639f7ffb996788a95797 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Sep 2019 13:03:48 +0200
Subject: 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.
---
 lib/attrsets.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/attrsets.nix')

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 4b73735fd8500..607a22393f8ad 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;
-- 
cgit 1.4.1