Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

3 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix
index 34ffa1568b9..4fbd0965c78 100644
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
     homepace    = http://sourceforge.jp/projects/anthy/;
     license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ericsagnes ];
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchurl {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index 88ba436207c..9d8427e533c 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description   = "Fcitx Wrapper for anthy";
     license       = licenses.gpl2Plus;
     platforms     = platforms.linux;
-    maintainers   = with maintainers; [ iyzsong ericsagnes ];
+    maintainers   = with maintainers; [ ericsagnes ];
   };
 
 }
diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 8cdcabf3693..d2e46f704c8 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     description = "A Flexible Input Method Framework";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes];
+    maintainers = with stdenv.lib.maintainers; [ ericsagnes ];
   };
 }