diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-30 21:56:13 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-30 21:56:13 +0200 |
| commit | a9780a095bd05c5104c643f927a680194d040a92 (patch) | |
| tree | 0fbfee23559abd7e429dfc9066bd8a2747404612 /lib/attrsets.nix | |
| parent | 91b01208a0bdbf88213d1a4b40a35d249c035ac7 (diff) | |
| parent | efb16b582944c426353e407861d7172f24d965dd (diff) | |
| download | nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar.gz nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar.bz2 nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar.lz nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar.xz nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.tar.zst nixpkgs-a9780a095bd05c5104c643f927a680194d040a92.zip | |
Merge branch 'master' into staging-next
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; |