diff options
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/couchdb/2.0.0.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/couchdb/3.nix | 38 | ||||
-rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/jboss/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/tomcat-native.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/unit/default.nix | 8 |
9 files changed, 63 insertions, 25 deletions
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 3f6f00e1bdbf..737947c0524b 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))]; patches = [ ./jsapi.patch ]; postPatch = '' diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix new file mode 100644 index 000000000000..18271e82a8f9 --- /dev/null +++ b/pkgs/servers/http/couchdb/3.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 +, coreutils, bash, makeWrapper, python3 }: + +stdenv.mkDerivation rec { + pname = "couchdb"; + version = "3.1.0"; + + + # when updating this, please consider bumping the erlang/OTP version + # in all-packages.nix + src = fetchurl { + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; + sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; + }; + + buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; + postPatch = '' + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" + patchShebangs bin/rebar + ''; + + dontAddPrefix= "True"; + configureFlags = ["--spidermonkey-version=68"]; + buildFlags = ["release"]; + + installPhase = '' + mkdir -p $out + cp -r rel/couchdb/* $out + ''; + + meta = with stdenv.lib; { + 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; + platforms = platforms.all; + maintainers = with maintainers; [ lostnet ]; + }; +} diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index b8807532181a..b484cce15a26 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; - buildInputs = [ erlang icu openssl spidermonkey curl ]; + buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; postInstall = '' substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index b470a127aee5..00ed93c860c1 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - + installPhase = '' mv $PWD $out find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; - + meta = with stdenv.lib; { - homepage = "http://www.jboss.org/"; + homepage = "https://www.jboss.org/"; description = "Open Source J2EE application server"; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index de74a72e7880..934506c45ca9 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.2"; - sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"; + version = "1.19.3"; + sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci"; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 983e0f41ee91..ae658a7fdd4e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -20,7 +20,7 @@ in { fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; - ngx_aws_auth = throw "fastcgi-cache-purge was renamed to aws-auth"; + ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; aws-auth = { src = fetchFromGitHub { @@ -229,8 +229,8 @@ in name = "naxsi"; owner = "nbs-system"; repo = "naxsi"; - rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241"; - sha256 = "1kdqy7by6ha2pl9lkkjxh4qrwcsrj2alm8fl129831h5y5xy8qx2"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; } + "/naxsi_src"; }; @@ -240,8 +240,8 @@ in name = "opentracing"; owner = "opentracing-contrib"; repo = "nginx-opentracing"; - rev = "v0.9.0"; - sha256 = "02rf1909grbhvs9mjxrv7pwgbf7b8rpjw7j8rpwxag2rgvlsic3g"; + rev = "v0.10.0"; + sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb"; }; in "${src'}/opentracing"; inputs = [ pkgs.opentracing-cpp ]; @@ -335,8 +335,8 @@ in name = "shibboleth"; owner = "nginx-shib"; repo = "nginx-http-shibboleth"; - rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27"; - sha256 = "1l0h3ic9mfsci89d0k5q3igkfpzq052ia25xj5hc8fq388yrhpap"; + rev = "3f5ff4212fa12de23cb1acae8bf3a5a432b3f43b"; + sha256 = "136zjipaz7iikgcgqwdv1mrh3ya996zyzbkdy6d4k07s2h9g7hy6"; }; }; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index d845d92ec8a5..734dfb041403 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -8,12 +8,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.15.8"; - version = "${nginxVersion}.3"; + nginxVersion = "1.17.8"; + version = "${nginxVersion}.2"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; + sha256 = "1813w33hjm1hcqvl3b3f67qgi5zfjiqg6s01hiy12a5j3jqilcig"; }; fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 17c4367866fb..fa2769f99dd3 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.24"; + version = "1.2.25"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; + sha512 = "e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 2f73a5d92439..27f45fe6e479 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -3,8 +3,8 @@ , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 , withPHP74 ? true, php74 -, withPerl528 ? false, perl528 -, withPerl530 ? true, perl530 +, withPerl530 ? false, perl530 +, withPerl532 ? true, perl532 , withPerldevel ? false, perldevel , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 @@ -47,8 +47,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit ++ optional withPHP74 php74-unit - ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 + ++ optional withPerl532 perl532 ++ optional withPerldevel perldevel ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 @@ -73,8 +73,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} - ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} + ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} |