summary refs log tree commit diff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-01 13:38:17 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-01 13:38:17 -0700
commit7eae48871f36e3f486db66df9b667251051a0bd8 (patch)
treea3c54b1d53bf10c812e4db30444b2d59ac9c7973 /pkgs/servers/sql
parent05aa0c09909c1fafaf95f29f8905ba9002922ba2 (diff)
parent87836a2a21f04cd7bcfcd243edbf912845bdf382 (diff)
downloadnixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar.gz
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar.bz2
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar.lz
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar.xz
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.tar.zst
nixlib-7eae48871f36e3f486db66df9b667251051a0bd8.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/mariadb/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ab93c3499dc3..1e962f5df90d 100644
--- 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;
   };
 }