Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00
parent 05aa0c0990 87836a2a21
commit 7eae48871f
83 changed files with 894 additions and 219 deletions
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
    description = "An enhanced, drop-in replacement for MySQL";
    homepage    = https://mariadb.org/;
    license     = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ];
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice wkennington ];
    platforms   = stdenv.lib.platforms.all;
  };
 }