diff options
author | Robert Hensing <robert@roberthensing.nl> | 2019-09-11 13:03:48 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2019-09-11 13:12:06 +0200 |
commit | fc64cf65abfd6f42910a639f7ffb996788a95797 (patch) | |
tree | 3d4bf11fd2d59eb471682e8dd81a93af1a2244a5 /lib | |
parent | 8935bfb4ac3680e38a8811c12282e2026f7e82ae (diff) | |
download | nixpkgs-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')
-rw-r--r-- | lib/attrsets.nix | 5 | ||||
-rw-r--r-- | lib/default.nix | 2 |
2 files changed, 6 insertions, 1 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; diff --git a/lib/default.nix b/lib/default.nix index 34c72a3512e..88083214a31 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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 |