diff options
| author | volth <volth@volth.com> | 2018-07-05 03:01:13 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-07-05 03:08:00 +0000 |
| commit | e9a6c7cebb62237a523eba804339df6932803459 (patch) | |
| tree | 238fdae092751f8708b7897fd52d99eeb5c1c0b5 /lib | |
| parent | 1999d279ecd50e4020ef86cda179f3f86ef168ac (diff) | |
lib.concatMap and lib.mapAttrs to be builtins
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 5 | ||||
| -rw-r--r-- | lib/lists.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 19218cfe8ecb..dca39cf79ffa 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -195,8 +195,9 @@ rec { { x = "foo"; y = "bar"; } => { x = "x-foo"; y = "y-bar"; } */ - mapAttrs = f: set: - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)); + mapAttrs = builtins.mapAttrs or + (f: set: + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))); /* Like `mapAttrs', but allows the name of each attribute to be diff --git a/lib/lists.nix b/lib/lists.nix index 194e1c200ec9..231c2317c0c4 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -101,7 +101,7 @@ rec { concatMap (x: [x] ++ ["z"]) ["a" "b"] => [ "a" "z" "b" "z" ] */ - concatMap = f: list: concatLists (map f list); + concatMap = builtins.concatMap or (f: list: concatLists (map f list)); /* Flatten the argument into a single list; that is, nested lists are spliced into the top-level lists. |