diff options
| author | Peter Simons <simons@cryp.to> | 2011-11-08 10:18:35 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-11-08 10:18:35 +0000 |
| commit | 368ac01473c8beae0f879bb33ee06a9d54e942c4 (patch) | |
| tree | f68790020f625a0f7ce4de68cf388fb0b75f6908 /pkgs/lib | |
| parent | 91ab98ce09f5f7d62932d198f678663d0cf40721 (diff) | |
| parent | d5a21a68e5862ff3604f5b657bb4031ce76129e6 (diff) | |
| download | nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.gz nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.bz2 nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.lz nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.xz nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.zst nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.zip | |
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/attrsets.nix | 2 | ||||
| -rw-r--r-- | pkgs/lib/maintainers.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index f39b46db6213..fcaf4f5c9b5c 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -273,6 +273,6 @@ rec { # override only the attributes that are already present in the old set # useful for deep-overriding overrideExisting = old: new: - old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); + old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 4cf215ee3b8e..9652a32bb2e5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -27,7 +27,7 @@ simons = "Peter Simons <simons@cryp.to>"; thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; - viric = "Lluís Batlle i Rossell <viriketo@gmail.com>"; + viric = "Lluís Batlle i Rossell <viric@viric.name>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; z77z = "Marco Maggesi <maggesi@math.unifi.it>"; } |