diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-10 09:21:09 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-10 09:21:09 -0800 |
| commit | 12fd8a77e154bda7f1ed6f30a355d42ef75a2c74 (patch) | |
| tree | c8f22398fa090090363688c49bd0b1b6d518c73b /lib | |
| parent | 1a17758b78d2d3afd9af7e22c29111d4f0d247d2 (diff) | |
| parent | 94edc09ac9c7cc11cbbd03b2ae7553b737d6b959 (diff) | |
| download | nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar.gz nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar.bz2 nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar.lz nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar.xz nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.tar.zst nixlib-12fd8a77e154bda7f1ed6f30a355d42ef75a2c74.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/top-level/aliases.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index dafdd98f498e..a88947b45858 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -276,7 +276,7 @@ rec { /* Like `mapAttrsRecursive', but it takes an additional predicate - function that tells it whether to recursive into an attribute + function that tells it whether to recurse into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not recurse, but does apply the map function. If it returns true, it does recurse, and does not apply the map function. |