public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Robert Hensing 2019-09-11 13:03:48 +02:00
parent 8935bfb4ac
commit fc64cf65ab
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/attrsets.nix
View File

@ -479,6 +479,11 @@ rec {
recurseIntoAttrs = recurseIntoAttrs =
attrs: attrs // { recurseForDerivations = true; }; attrs: attrs // { recurseForDerivations = true; };
/* Undo the effect of recurseIntoAttrs.
*/
dontRecurseIntoAttrs =
attrs: attrs // { recurseForDerivations = false; };
/*** deprecated stuff ***/ /*** deprecated stuff ***/
zipWithNames = zipAttrsWithNames; zipWithNames = zipAttrsWithNames;

2
lib/default.nix
View File

@ -71,7 +71,7 @@ let
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs overrideExisting getOutput getBin recursiveUpdate matchAttrs overrideExisting getOutput getBin
getLib getDev chooseDevOutputs zipWithNames zip getLib getDev chooseDevOutputs zipWithNames zip
recurseIntoAttrs; recurseIntoAttrs dontRecurseIntoAttrs;
inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count concatMap flatten remove findSingle findFirst any all count
optional optionals toList range partition zipListsWith zipLists optional optionals toList range partition zipListsWith zipLists

2
pkgs/top-level/all-packages.nix
View File

@ -72,7 +72,7 @@ in
# the Attrs which is useful for testing massive changes. Ideally, # the Attrs which is useful for testing massive changes. Ideally,
# every package subset not marked with recurseIntoAttrs should be # every package subset not marked with recurseIntoAttrs should be
# marked with this. # marked with this.
dontRecurseIntoAttrs = x: x; inherit (lib) dontRecurseIntoAttrs;
stringsWithDeps = lib.stringsWithDeps; stringsWithDeps = lib.stringsWithDeps;