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

pkgs/servers/http/apache-modules/mod_python/default.nix

@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://modpython.org/;
     description = "An Apache module that embeds the Python interpreter within the server";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/servers/http/apache-modules/tomcat-connectors/default.nix

@@ -18,4 +18,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ apacheHttpd jdk ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/servers/http/couchdb/default.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
     homepage = "http://couchdb.apache.org";
     license = licenses.asl20;
-    platform = platforms.all;
+    platforms = platforms.all;
     maintainers = with maintainers; [ garbas ];
   };
 }

pkgs/servers/http/jboss/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation {
     description = "Open Source J2EE application server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.sander ];
+    platforms = platforms.unix;
   };
 }

pkgs/servers/http/jboss/jdbc/mysql/default.nix

@@ -6,4 +6,8 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   inherit mysql_jdbc;
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/servers/http/spawn-fcgi/default.nix

@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "Provides an interface to external programs that support the FastCGI interface";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ cstrahan ];
+    platforms = with platforms; unix;
   };
 }

pkgs/servers/http/thttpd/default.nix

@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "Tiny/turbo/throttling HTTP server";
     homepage = "http://www.acme.com/software/thttpd/";
     license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/servers/http/tomcat/axis2/default.nix

@@ -14,5 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/servers/http/tomcat/jdbc/mysql/default.nix

@@ -6,4 +6,8 @@ stdenv.mkDerivation {
   buildInputs = [ mysql_jdbc ];
   
   inherit mysql_jdbc;
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }