Merge pull request #95573 from Izorkin/nginx-update
This commit is contained in:
Jörg Thalheim
GitHub
commit
25e1ebbe0f
@ -970,6 +970,8 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Nginx module <literal>nginxModules.fastcgi-cache-purge</literal> renamed to official name <literal>nginxModules.cache-purge</literal>.
|
||||
Nginx module <literal>nginxModules.ngx_aws_auth</literal> renamed to official name <literal>nginxModules.aws-auth</literal>.
|
||||
The packages <package>perl</package>, <package>rsync</package> and <package>strace</package> were removed from <option>systemPackages</option>. If you need them, install them again with <code><xref linkend="opt-environment.systemPackages"/> = with pkgs; [ perl rsync strace ];</code> in your <filename>configuration.nix</filename>.
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.19.0";
|
||||
sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4";
|
||||
version = "1.19.2";
|
||||
sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw";
|
||||
}
|
||||
|
||||
@ -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,6 +453,7 @@ in
|
||||
|
||||
video-thumbextractor = {
|
||||
src = fetchFromGitHub {
|
||||
name = "video-thumbextractor";
|
||||
owner = "wandenberg";
|
||||
repo = "nginx-video-thumbextractor-module";
|
||||
rev = "0.9.0";
|
||||
@ -418,6 +464,7 @@ in
|
||||
|
||||
vts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "vts";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-vts";
|
||||
rev = "v0.1.18";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user