diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23 17:41:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23 18:31:54 +0200 |
| commit | 0ae8b365b35fa1c3cac700ce34b37012f96d7deb (patch) | |
| tree | 4cc6b0f223975a176ef6035283802ba21687706b /lib/attrsets.nix | |
| parent | 637e35deb99c5efbb8bd760a3ad08d3899534ead (diff) | |
Rename misc.nix -> deprecated.nix
Diffstat (limited to 'lib/attrsets.nix')
| -rw-r--r-- | lib/attrsets.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index d81d69b14025..20be2002402c 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -6,7 +6,6 @@ with { inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; - inherit (import ./misc.nix) maybeAttr; }; rec { @@ -86,7 +85,7 @@ rec { foldAttrs = op: nul: list_of_attrs: fold (n: a: fold (name: o: - o // (listToAttrs [{inherit name; value = op n.${name} (maybeAttr name nul a); }]) + o // (listToAttrs [{inherit name; value = op n.${name} (a.${name} or nul); }]) ) a (attrNames n) ) {} list_of_attrs; |