Merge remote-tracking branch 'upstream/master' into hardened-stdenv

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

@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.mysql.com/;
     description = "The world's most popular open source database";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/servers/sql/mysql/jdbc/default.nix

@@ -10,4 +10,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ unzip ant ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

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

@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://jdbc.postgresql.org/;
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
     license = licenses.bsd3;
+    platforms = platforms.unix;
   };
 }

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

@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
     homepage = http://psqlodbc.projects.postgresql.org/;
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
+    platforms = platforms.linux;
   };
 }