Merge staging-next into staging

pkgs/servers/sql/mariadb/default.nix

@@ -233,7 +233,7 @@ galera = stdenv.mkDerivation rec {
 
   buildInputs = [ asio boost check openssl scons ];
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace SConstruct \
       --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
   '';
@@ -243,11 +243,9 @@ galera = stdenv.mkDerivation rec {
     export LIBPATH="${galeraLibs}/lib"
   '';
 
-  buildPhase = ''
-     scons -j$NIX_BUILD_CORES ssl=1 system_asio=1 strict_build_flags=0
-  '';
+  sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
 
-  installPhase = ''
+  postInstall = ''
     # copied with modifications from scripts/packages/freebsd.sh
     GALERA_LICENSE_DIR="$share/licenses/${name}"
     install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}

pkgs/servers/sql/monetdb/default.nix

@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, pkgconfig
-, bison, openssl, readline
+{ stdenv, fetchurl, pkgconfig, file
+, bison, openssl, readline, bzip2
 }:
 
 let
-  version = "11.29.7";
+  version = "11.31.11";
 in stdenv.mkDerivation rec {
 
   name = "monetdb-${version}";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "19f9zfg94k8hr9qc7jp1iwl8av08mibzgmid0gbqplyhf6x1j0r7";
+    sha256 = "0x504jdxnqpxln6b69dqagzm2zknf11lykckmydzi6vapfc5msd3";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bison openssl readline ];
+  postPatch = ''
+    sed -i "s,/usr/bin/file,${file}/bin/file," configure
+  '';
+
+  nativeBuildInputs = [ pkgconfig file ];
+  buildInputs = [ bison openssl readline bzip2 ];
 
   meta = with stdenv.lib; {
     description = "An open source database system";

pkgs/servers/sql/mysql/5.5.x.nix

@@ -69,9 +69,14 @@ self = stdenv.mkDerivation rec {
     mysqlVersion = "5.5";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    # See https://downloads.mysql.com/docs/licenses/mysqld-5.5-gpl-en.pdf
+    license = with licenses; [
+      artistic1 bsd0 bsd2 bsd3 bsdOriginal
+      gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib
+    ];
   };
 }; in self

pkgs/servers/sql/mysql/5.7.x.nix

@@ -75,9 +75,13 @@ self = stdenv.mkDerivation rec {
     mysqlVersion = "5.7";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = with licenses; [
+      artistic1 bsd0 bsd2 bsd3 bsdOriginal
+      gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
+    ];
   };
 }; in self

pkgs/servers/sql/postgresql/pgtap/default.nix

@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ willibutz ];
     homepage = https://pgtap.org;
     inherit (postgresql.meta) platforms;
+    license = licenses.mit;
   };
 }

pkgs/servers/sql/virtuoso/6.x.nix

@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "SQL/RDF database used by, e.g., KDE-nepomuk";
     homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
     platforms = platforms.linux;
-    maintainers = [ ];
+    license = licenses.gpl2;
   };
 }

pkgs/servers/sql/virtuoso/7.x.nix

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
     #configure: The current version [...] can only be built on 64bit platforms
     platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
+    license = licenses.gpl2;
   };
 }