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.
2019-09-11 13:12:06 +02:00
parent 8935bfb4ac
commit fc64cf65ab
3 changed files with 7 additions and 2 deletions
@@ -479,6 +479,11 @@ rec {
  recurseIntoAttrs =
    attrs: attrs // { recurseForDerivations = true; };

+  /* Undo the effect of recurseIntoAttrs.
+   */
+  dontRecurseIntoAttrs =
+    attrs: attrs // { recurseForDerivations = false; };
+
  /*** deprecated stuff ***/

  zipWithNames = zipAttrsWithNames;
@@ -71,7 +71,7 @@ let
      zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
      recursiveUpdate matchAttrs overrideExisting getOutput getBin
      getLib getDev chooseDevOutputs zipWithNames zip
-      recurseIntoAttrs;
+      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