aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/servers/http
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/servers/http')
-rw-r--r--nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix5
-rw-r--r--nixpkgs/pkgs/servers/http/couchdb/3.nix38
-rw-r--r--nixpkgs/pkgs/servers/http/hiawatha/default.nix4
-rw-r--r--nixpkgs/pkgs/servers/http/jetty/default.nix4
-rw-r--r--nixpkgs/pkgs/servers/http/nginx/generic.nix3
-rw-r--r--nixpkgs/pkgs/servers/http/nginx/mainline.nix4
-rw-r--r--nixpkgs/pkgs/servers/http/nginx/modules.nix141
-rw-r--r--nixpkgs/pkgs/servers/http/openresty/default.nix8
-rw-r--r--nixpkgs/pkgs/servers/http/pshs/default.nix4
-rw-r--r--nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix4
-rw-r--r--nixpkgs/pkgs/servers/http/unit/default.nix19
-rw-r--r--nixpkgs/pkgs/servers/http/webhook/default.nix4
12 files changed, 160 insertions, 78 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 8d8a0fceefb..4b63b589ea9 100644
--- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
- version = "2.4.43";
+ version = "2.4.46";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4";
+ sha256 = "1sj1rwgbcjgkzac3ybjy7j68c9b3dv3ap71m48mrjhf6w7vds3kl";
};
# FIXME: -dev depends on -doc
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
- sed -i support/apachectl.in -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
'';
# Required for ‘pthread_cancel’.
diff --git a/nixpkgs/pkgs/servers/http/couchdb/3.nix b/nixpkgs/pkgs/servers/http/couchdb/3.nix
new file mode 100644
index 00000000000..3716afae490
--- /dev/null
+++ b/nixpkgs/pkgs/servers/http/couchdb/3.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
+, 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 (python3.withPackages(ps: with ps; [ requests ]))];
+ postPatch = ''
+ substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.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/nixpkgs/pkgs/servers/http/hiawatha/default.nix b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
index b731d4d0b34..7def709a840 100644
--- a/nixpkgs/pkgs/servers/http/hiawatha/default.nix
+++ b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "hiawatha";
- version = "10.9";
+ version = "10.11";
src = fetchFromGitLab {
owner = "hsleisink";
repo = "hiawatha";
rev = "v${version}";
- sha256 = "0mcg36bidy3p57nyk9nliqjipfb3r2irziavlbr2d5g3smfv52z2";
+ sha256 = "10a7dqj37zrbmgnhwsw0mqm5x25kasl8p95g01rzakviwxkdrkid";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/nixpkgs/pkgs/servers/http/jetty/default.nix b/nixpkgs/pkgs/servers/http/jetty/default.nix
index 4f34fde1856..20370fd37c7 100644
--- a/nixpkgs/pkgs/servers/http/jetty/default.nix
+++ b/nixpkgs/pkgs/servers/http/jetty/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jetty";
- version = "9.4.29.v20200521";
+ version = "9.4.31.v20200723";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
name = "jetty-distribution-${version}.tar.gz";
- sha256 = "0ir7rzr5479k7whgy0fx6bjj7x978ghx4fxc64i39hg2kzcp5dbi";
+ sha256 = "1j1dhlrlj7xnijp55c1hd9r47m6bq37vpjkaf8f9fg7q9m2z9x6x";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 80bc1458ad7..6ec5b0a7851 100644
--- a/nixpkgs/pkgs/servers/http/nginx/generic.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix
@@ -4,6 +4,7 @@
, withDebug ? false
, withStream ? true
, withMail ? false
+, withPerl ? true
, modules ? []
, ...
}:
@@ -87,7 +88,7 @@ stdenv.mkDerivation {
] ++ optionals withMail [
"--with-mail"
"--with-mail_ssl_module"
- ] ++ optional (perl != null) [
+ ] ++ optionals withPerl [
"--with-http_perl_module"
"--with-perl=${perl}/bin/perl"
"--with-perl_modules_path=lib/perl5"
diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index 74df3c16472..de74a72e788 100644
--- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.18.0";
- sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc";
+ version = "1.19.2";
+ sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw";
}
diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix
index 4ea74019692..983e0f41ee9 100644
--- a/nixpkgs/pkgs/servers/http/nginx/modules.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix
@@ -4,10 +4,11 @@ let
http_proxy_connect_module_generic = patchName: rec {
src = fetchFromGitHub {
+ name = "http_proxy_connect_module_generic";
owner = "chobits";
repo = "ngx_http_proxy_connect_module";
- rev = "002f8f9ef15562dc3691b977134518ad216d7a90";
- sha256 = "163wg0xb7w5mwh6wrfarzcgaf6c7gb5qydgpi2wk35k551f7286s";
+ rev = "96ae4e06381f821218f368ad0ba964f87cbe0266";
+ sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh";
};
patches = [
@@ -18,12 +19,26 @@ let
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";
+
+ aws-auth = {
+ src = fetchFromGitHub {
+ name = "aws-auth";
+ owner = "anomalizer";
+ repo = "ngx_aws_auth";
+ rev = "2.1.1";
+ sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
+ };
+ };
+
brotli = {
src = let gitsrc = pkgs.fetchFromGitHub {
+ name = "brotli";
owner = "google";
repo = "ngx_brotli";
- rev = "e505dce68acc190cc5a1e780a3b0275e39f160ca";
- sha256 = "00j48lffki62y1nmjyy81iklw5nlyzvrjy3z04qch4fp3p57hwla";
+ rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
+ sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv";
}; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
cp -a ${gitsrc} $out
substituteInPlace $out/filter/config \
@@ -32,8 +47,19 @@ in
inputs = [ pkgs.brotli ];
};
+ cache-purge = {
+ src = fetchFromGitHub {
+ name = "cache-purge";
+ owner = "nginx-modules";
+ repo = "ngx_cache_purge";
+ rev = "2.5.1";
+ sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
+ };
+ };
+
coolkit = {
src = fetchFromGitHub {
+ name = "coolkit";
owner = "FRiCKLE";
repo = "ngx_coolkit";
rev = "0.2";
@@ -43,6 +69,7 @@ in
dav = {
src = fetchFromGitHub {
+ name = "dav";
owner = "arut";
repo = "nginx-dav-ext-module";
rev = "v3.0.0";
@@ -53,24 +80,27 @@ in
develkit = {
src = fetchFromGitHub {
- owner = "simpl";
+ name = "develkit";
+ owner = "vision5";
repo = "ngx_devel_kit";
- rev = "v0.3.1rc1";
- sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb";
+ rev = "v0.3.1";
+ sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq";
};
};
echo = {
src = fetchFromGitHub {
+ name = "echo";
owner = "openresty";
repo = "echo-nginx-module";
- rev = "v0.61";
- sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k";
+ rev = "v0.62";
+ sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl";
};
};
fancyindex = {
src = fetchFromGitHub {
+ name = "fancyindex";
owner = "aperezdc";
repo = "ngx-fancyindex";
rev = "v0.4.4";
@@ -78,17 +108,9 @@ in
};
};
- fastcgi-cache-purge = {
- src = fetchFromGitHub {
- owner = "nginx-modules";
- repo = "ngx_cache_purge";
- rev = "2.5";
- sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y";
- };
- };
-
fluentd = {
src = fetchFromGitHub {
+ name = "fluentd";
owner = "fluent";
repo = "nginx-fluentd-module";
rev = "8af234043059c857be27879bc547c141eafd5c13";
@@ -96,12 +118,17 @@ in
};
};
- http_proxy_connect_module_v16 = http_proxy_connect_module_generic "proxy_connect_rewrite_101504" // {
- supports = with lib.versions; version: major version == "1" && minor version == "16";
+ http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // {
+ supports = with lib.versions; version: major version == "1" && minor version == "18";
+ };
+
+ http_proxy_connect_module_v19 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // {
+ supports = with lib.versions; version: major version == "1" && minor version == "19";
};
ipscrub = {
src = fetchFromGitHub {
+ name = "ipscrub";
owner = "masonicboom";
repo = "ipscrub";
rev = "v1.0.1";
@@ -112,6 +139,7 @@ in
limit-speed = {
src = fetchFromGitHub {
+ name = "limit-speed";
owner = "yaoweibin";
repo = "nginx_limit_speed_module";
rev = "f77ad4a56fbb134878e75827b40cf801990ed936";
@@ -121,6 +149,7 @@ in
live ={
src = fetchFromGitHub {
+ name = "live";
owner = "arut";
repo = "nginx-live-module";
rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd";
@@ -130,6 +159,7 @@ in
lua = {
src = fetchFromGitHub {
+ name = "lua";
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.10.15";
@@ -145,6 +175,7 @@ in
lua-upstream = {
src = fetchFromGitHub {
+ name = "lua-upstream";
owner = "openresty";
repo = "lua-upstream-nginx-module";
rev = "v0.07";
@@ -164,16 +195,18 @@ in
modsecurity-nginx = {
src = fetchFromGitHub {
+ name = "modsecurity-nginx";
owner = "SpiderLabs";
repo = "ModSecurity-nginx";
- rev = "v1.0.0";
- sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7";
+ rev = "v1.0.1";
+ sha256 = "0cbb3g3g4v6q5zc6an212ia5kjjad62bidnkm8b70i4qv1615pzf";
};
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
};
moreheaders = {
src = fetchFromGitHub {
+ name = "moreheaders";
owner = "openresty";
repo = "headers-more-nginx-module";
rev = "v0.33";
@@ -183,6 +216,7 @@ in
mpeg-ts ={
src = fetchFromGitHub {
+ name = "mpeg-ts";
owner = "arut";
repo = "nginx-ts-module";
rev = "v0.1.1";
@@ -192,29 +226,22 @@ in
naxsi ={
src = fetchFromGitHub {
+ name = "naxsi";
owner = "nbs-system";
repo = "naxsi";
- rev = "0.56";
- sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v";
+ rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241";
+ sha256 = "1kdqy7by6ha2pl9lkkjxh4qrwcsrj2alm8fl129831h5y5xy8qx2";
} + "/naxsi_src";
};
- ngx_aws_auth = {
- src = fetchFromGitHub {
- owner = "anomalizer";
- repo = "ngx_aws_auth";
- rev = "2.1.1";
- sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
- };
- };
-
opentracing = {
src =
let src' = fetchFromGitHub {
+ name = "opentracing";
owner = "opentracing-contrib";
repo = "nginx-opentracing";
- rev = "v0.7.0";
- sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma";
+ rev = "v0.9.0";
+ sha256 = "02rf1909grbhvs9mjxrv7pwgbf7b8rpjw7j8rpwxag2rgvlsic3g";
};
in "${src'}/opentracing";
inputs = [ pkgs.opentracing-cpp ];
@@ -225,6 +252,7 @@ in
version = pkgs.psol.version;
moduleSrc = fetchFromGitHub {
+ name = "pagespeed";
owner = "pagespeed";
repo = "ngx_pagespeed";
rev = "v${version}-stable";
@@ -253,16 +281,18 @@ in
pam = {
src = fetchFromGitHub {
+ name = "pam";
owner = "stogh";
repo = "ngx_http_auth_pam_module";
- rev = "v1.5.1";
- sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl";
+ rev = "v1.5.2";
+ sha256 = "06nydxk82rc9yrw4408nakb197flxh4z1yv935crg65fn9706rl7";
};
inputs = [ pkgs.pam ];
};
pinba = {
src = fetchFromGitHub {
+ name = "pinba";
owner = "tony2001";
repo = "ngx_http_pinba_module";
rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6";
@@ -272,15 +302,17 @@ in
push-stream ={
src = fetchFromGitHub {
+ name = "push-stream";
owner = "wandenberg";
repo = "nginx-push-stream-module";
- rev = "0.5.4";
- sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr";
+ rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90";
+ sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr";
};
};
rtmp ={
src = fetchFromGitHub {
+ name = "rtmp";
owner = "arut";
repo = "nginx-rtmp-module";
rev = "v1.2.1";
@@ -290,6 +322,7 @@ in
set-misc = {
src = fetchFromGitHub {
+ name = "set-misc";
owner = "openresty";
repo = "set-misc-nginx-module";
rev = "v0.32";
@@ -299,15 +332,17 @@ in
shibboleth = {
src = fetchFromGitHub {
+ name = "shibboleth";
owner = "nginx-shib";
repo = "nginx-http-shibboleth";
- rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4";
- sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc";
+ rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27";
+ sha256 = "1l0h3ic9mfsci89d0k5q3igkfpzq052ia25xj5hc8fq388yrhpap";
};
};
sla = {
src = fetchFromGitHub {
+ name = "sla";
owner = "goldenclone";
repo = "nginx-sla";
rev = "7778f0125974befbc83751d0e1cadb2dcea57601";
@@ -317,6 +352,7 @@ in
slowfs-cache = {
src = fetchFromGitHub {
+ name = "slowfs-cache";
owner = "FRiCKLE";
repo = "ngx_slowfs_cache";
rev = "1.10";
@@ -326,6 +362,7 @@ in
sorted-querystring = {
src = fetchFromGitHub {
+ name = "sorted-querystring";
owner = "wandenberg";
repo = "nginx-sorted-querystring-module";
rev = "0.3";
@@ -335,7 +372,8 @@ in
statsd = {
src = fetchFromGitHub {
- owner = "apcera";
+ name = "statsd";
+ owner = "harvesthq";
repo = "nginx-statsd";
rev = "b970e40467a624ba710c9a5106879a0554413d15";
sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr";
@@ -344,6 +382,7 @@ in
stream-sts = {
src = fetchFromGitHub {
+ name = "stream-sts";
owner = "vozlt";
repo = "nginx-module-stream-sts";
rev = "v0.1.1";
@@ -353,6 +392,7 @@ in
sts = {
src = fetchFromGitHub {
+ name = "sts";
owner = "vozlt";
repo = "nginx-module-sts";
rev = "v0.1.1";
@@ -362,15 +402,17 @@ in
subsFilter = {
src = fetchFromGitHub {
+ name = "subsFilter";
owner = "yaoweibin";
repo = "ngx_http_substitutions_filter_module";
- rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b";
- sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar";
+ rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0";
+ sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f";
};
};
sysguard = {
src = fetchFromGitHub {
+ name = "sysguard";
owner = "vozlt";
repo = "nginx-module-sysguard";
rev = "e512897f5aba4f79ccaeeebb51138f1704a58608";
@@ -380,15 +422,17 @@ in
upstream-check = {
src = fetchFromGitHub {
+ name = "upstream-check";
owner = "yaoweibin";
repo = "nginx_upstream_check_module";
- rev = "007f76f7adbcbd6abd9352502af1a4ae463def85";
- sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in";
+ rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e";
+ sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l";
};
};
upstream-tarantool = {
src = fetchFromGitHub {
+ name = "upstream-tarantool";
owner = "tarantool";
repo = "nginx_upstream_module";
rev = "v2.7.1";
@@ -399,6 +443,7 @@ in
url = {
src = fetchFromGitHub {
+ name = "url";
owner = "vozlt";
repo = "nginx-module-url";
rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e";
@@ -408,16 +453,18 @@ in
video-thumbextractor = {
src = fetchFromGitHub {
+ name = "video-thumbextractor";
owner = "wandenberg";
repo = "nginx-video-thumbextractor-module";
rev = "0.9.0";
sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7";
};
- inputs = [ pkgs.ffmpeg ];
+ inputs = [ pkgs.ffmpeg_3 ];
};
vts = {
src = fetchFromGitHub {
+ name = "vts";
owner = "vozlt";
repo = "nginx-module-vts";
rev = "v0.1.18";
diff --git a/nixpkgs/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix
index 9c01cfb19e1..734dfb04140 100644
--- a/nixpkgs/pkgs/servers/http/openresty/default.nix
+++ b/nixpkgs/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
@@ -34,6 +34,8 @@ callPackage ../nginx/generic.nix args rec {
postInstall = ''
ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty
ln -s $out/nginx/sbin/nginx $out/bin/nginx
+ ln -s $out/nginx/conf $out/conf
+ ln -s $out/nginx/html $out/html
'';
meta = {
diff --git a/nixpkgs/pkgs/servers/http/pshs/default.nix b/nixpkgs/pkgs/servers/http/pshs/default.nix
index f83ab4642f0..e8ecb16c0c5 100644
--- a/nixpkgs/pkgs/servers/http/pshs/default.nix
+++ b/nixpkgs/pkgs/servers/http/pshs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pshs";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "mgorny";
repo = "pshs";
rev = "v${version}";
- sha256 = "04l03myh99npl78y8nss053gnc7k8q60vdbdpml19sshmwaw3fgi";
+ sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix
index 17c4367866f..fa2769f99dd 100644
--- a/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix
+++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix
index fbb7768dcba..27f45fe6e47 100644
--- a/nixpkgs/pkgs/servers/http/unit/default.nix
+++ b/nixpkgs/pkgs/servers/http/unit/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, nixosTests, which
, withPython2 ? false, python2
, withPython3 ? true, python3, ncurses
-, withPHP72 ? false, php72
, 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
-, withRuby_2_7 ? true, ruby_2_7
+, withRuby_2_7 ? false, ruby_2_7
, withSSL ? true, openssl ? null
, withIPv6 ? true
, withDebug ? false
@@ -27,19 +26,18 @@ let
fpmSupport = false;
};
- php72-unit = php72.override phpConfig;
php73-unit = php73.override phpConfig;
php74-unit = php74.override phpConfig;
in stdenv.mkDerivation rec {
- version = "1.18.0";
+ version = "1.19.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
- sha256 = "0r2l3ra63qjjbpjzrmx75jp9fvz83yis4j3qxqdnmxm77psykwy8";
+ sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k";
};
nativeBuildInputs = [ which ];
@@ -47,11 +45,10 @@ in stdenv.mkDerivation rec {
buildInputs = [ ]
++ optional withPython2 python2
++ optionals withPython3 [ python3 ncurses ]
- ++ optional withPHP72 php72-unit
++ 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
@@ -68,18 +65,16 @@ in stdenv.mkDerivation rec {
++ optional withDebug "--debug";
# Optionally add the PHP derivations used so they can be addressed in the configs
- usedPhp72 = optionals withPHP72 php72-unit;
usedPhp73 = optionals withPHP73 php73-unit;
usedPhp74 = optionals withPHP74 php74-unit;
postConfigure = ''
${optionalString withPython2 "./configure python --module=python2 --config=python2-config --lib-path=${python2}/lib"}
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
- ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/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"}
diff --git a/nixpkgs/pkgs/servers/http/webhook/default.nix b/nixpkgs/pkgs/servers/http/webhook/default.nix
index d40adb171a6..fe428926704 100644
--- a/nixpkgs/pkgs/servers/http/webhook/default.nix
+++ b/nixpkgs/pkgs/servers/http/webhook/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "webhook";
- version = "2.6.8";
+ version = "2.7.0";
goPackagePath = "github.com/adnanh/webhook";
excludedPackages = [ "test" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "adnanh";
repo = "webhook";
rev = version;
- sha256 = "05q6nv04ml1gr4k79czg03i3ifl05xq29iapkgrl3k0a36czxlgs";
+ sha256 = "1spiqjy0z84z96arf57bn6hyvfsd6l8w6nv874mbis6vagifikci";
};
meta = with lib; {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 12:08:03 +0000