diff options
author | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
commit | 1b979d83845945dabffebff5033cf864b41d5c64 (patch) | |
tree | 6e81ba4ab8cd28ad9fc8d9e2a3a298bc5a403042 /pkgs/servers/http | |
parent | 3f9e8601f2a8537de90f04375400538049bbdaf2 (diff) | |
parent | d93f917182dc5da7aca53fb9a847374ec0c7429a (diff) | |
download | nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.gz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.bz2 nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.lz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.xz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.zst nixlib-1b979d83845945dabffebff5033cf864b41d5c64.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_python/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/tomcat-connectors/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/jboss/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/jboss/jdbc/mysql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/spawn-fcgi/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/thttpd/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 4 |
9 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index d156576b21a8..bbd74de773ad 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/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; }; } diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index dee2fb3e4ff7..61de807d8e8d 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/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; + }; } diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 8b3edb27c17f..697c9d95884f 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/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 ]; }; } diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index d0d336ad08e6..2dd9d544a03b 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/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; }; } diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index 8544ce050afd..dbc5c73414cd 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/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; + }; } diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index b39e2b8fbf76..b5d5d5f7992d 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/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; }; } diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 030aa486daa7..692bba846eaf 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/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; }; } diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 50e6b2987045..f751fd7846c9 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/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; }; } diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 975d5234aee9..3562ea1e129d 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/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; + }; } |