diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-30 20:08:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 20:08:45 +0200 |
| commit | 911369605163f633433f9769d6c1373b3d855c46 (patch) | |
| tree | db7e4a37f30d66ece806f5c3debd5d660c177a6b /lib/attrsets.nix | |
| parent | 4caab41c1b4b57d9d971a1c1e5c4da35648615d4 (diff) | |
| parent | 526d604670a456e59a3d20b657d864f85bb52839 (diff) | |
| download | nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar.gz nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar.bz2 nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar.lz nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar.xz nixpkgs-911369605163f633433f9769d6c1373b3d855c46.tar.zst nixpkgs-911369605163f633433f9769d6c1373b3d855c46.zip | |
Merge pull request #45038 from symphorien/optopt
module system: rework module merging
Diffstat (limited to 'lib/attrsets.nix')
| -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 cda13ee43ee..1e4142562fa 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -145,7 +145,7 @@ rec { foldAttrs = op: nul: list_of_attrs: fold (n: a: fold (name: o: - o // (listToAttrs [{inherit name; value = op n.${name} (a.${name} or nul); }]) + o // { ${name} = op n.${name} (a.${name} or nul); } ) a (attrNames n) ) {} list_of_attrs; |