From c5d3a46c5fb70ef7b0bae3fbcb24caaf28e20773 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 09:59:10 +0300 Subject: [PATCH 01/17] nginxMainline: 1.19.0 -> 1.19.2 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index c67606785e5b..de74a72e7880 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.0"; - sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4"; + version = "1.19.2"; + sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"; } From 4bc560d2054b0b43e37201e39389d557bc8277f4 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 10:07:49 +0300 Subject: [PATCH 02/17] nginxModules.brotli: 2019.09.09 -> 2020.04.23 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9fcb3305f0ac..3faa9bbfd640 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -22,8 +22,8 @@ in src = let gitsrc = pkgs.fetchFromGitHub { 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 \ From 42cde0d357bc91c5ebed3c4dc66301ec4d03a2be Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 10:17:06 +0300 Subject: [PATCH 03/17] nginxModules.develkit: v0.3.1rc1 -> v0.3.1 --- pkgs/servers/http/nginx/modules.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 3faa9bbfd640..4e64f1842aa2 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -53,10 +53,10 @@ in develkit = { src = fetchFromGitHub { - owner = "simpl"; + owner = "vision5"; repo = "ngx_devel_kit"; - rev = "v0.3.1rc1"; - sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; + rev = "v0.3.1"; + sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq"; }; }; From 980d487480b41b457170b07db3bd459449bdbf58 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 10:19:35 +0300 Subject: [PATCH 04/17] nginxModules.echo: v0.61 -> v0.62 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4e64f1842aa2..0d74663b04f5 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -64,8 +64,8 @@ in src = fetchFromGitHub { owner = "openresty"; repo = "echo-nginx-module"; - rev = "v0.61"; - sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; + rev = "v0.62"; + sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl"; }; }; From 36c95f331dd69ddc198e35b2b1f6df5bdb290213 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 10:36:58 +0300 Subject: [PATCH 05/17] nginxModules.cache-purge: 2.5 -> 2.5.1 --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ pkgs/servers/http/nginx/modules.nix | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7a06c06fed1e..7485a6e7c10c 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -907,6 +907,11 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore. + + + Nginx module nginxModules.fastcgi-cache-purge renamed to official name nginxModules.cache-purge. + + diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0d74663b04f5..0f6611584234 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -18,6 +18,8 @@ let in { + fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; + brotli = { src = let gitsrc = pkgs.fetchFromGitHub { owner = "google"; @@ -32,6 +34,15 @@ in inputs = [ pkgs.brotli ]; }; + cache-purge = { + src = fetchFromGitHub { + owner = "nginx-modules"; + repo = "ngx_cache_purge"; + rev = "2.5.1"; + sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd"; + }; + }; + coolkit = { src = fetchFromGitHub { owner = "FRiCKLE"; @@ -78,15 +89,6 @@ in }; }; - fastcgi-cache-purge = { - src = fetchFromGitHub { - owner = "nginx-modules"; - repo = "ngx_cache_purge"; - rev = "2.5"; - sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y"; - }; - }; - fluentd = { src = fetchFromGitHub { owner = "fluent"; From 4460a3700bf36da6fb900e921c90436d29dd9852 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 11:19:32 +0300 Subject: [PATCH 06/17] nginxModules.http_proxy_connect_module: 2019.05.06 -> 2020.07.24 --- pkgs/servers/http/nginx/modules.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0f6611584234..4473194e7687 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -6,8 +6,8 @@ let src = fetchFromGitHub { owner = "chobits"; repo = "ngx_http_proxy_connect_module"; - rev = "002f8f9ef15562dc3691b977134518ad216d7a90"; - sha256 = "163wg0xb7w5mwh6wrfarzcgaf6c7gb5qydgpi2wk35k551f7286s"; + rev = "96ae4e06381f821218f368ad0ba964f87cbe0266"; + sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh"; }; patches = [ @@ -98,8 +98,12 @@ 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 = { From 9c588fce29b8d13f099165744f981c70d38ada05 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 11:57:25 +0300 Subject: [PATCH 07/17] nginxModules.modsecurity-nginx: v1.0.0 -> v1.0.1 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4473194e7687..04a1afc23f5d 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -172,8 +172,8 @@ in src = fetchFromGitHub { 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 ]; }; From b590894e5870f2eb02d0460909ddbfa08bf157b3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:01:54 +0300 Subject: [PATCH 08/17] nginxModules.naxsi: 0.56 -> 2020.08.15 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 04a1afc23f5d..5f55f595e0ea 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -200,8 +200,8 @@ in src = fetchFromGitHub { owner = "nbs-system"; repo = "naxsi"; - rev = "0.56"; - sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v"; + rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241"; + sha256 = "1kdqy7by6ha2pl9lkkjxh4qrwcsrj2alm8fl129831h5y5xy8qx2"; } + "/naxsi_src"; }; From cb62b1d1a89c26c50ed15a71940b11256c652021 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:06:24 +0300 Subject: [PATCH 09/17] nginxModules.opentracing: v0.7.0 -> v0.9.0 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 5f55f595e0ea..17cfaff71db7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -219,8 +219,8 @@ in let src' = fetchFromGitHub { 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 ]; From a27273294f3998d2349d69fefb66413da10c24aa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:08:59 +0300 Subject: [PATCH 10/17] nginxModules.pam: v1.5.1 -> v1.5.2 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 17cfaff71db7..af744d8c5729 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -261,8 +261,8 @@ in src = fetchFromGitHub { owner = "stogh"; repo = "ngx_http_auth_pam_module"; - rev = "v1.5.1"; - sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; + rev = "v1.5.2"; + sha256 = "06nydxk82rc9yrw4408nakb197flxh4z1yv935crg65fn9706rl7"; }; inputs = [ pkgs.pam ]; }; From fdc7f541cf15c9a628d003958baccd2f2217b647 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:11:48 +0300 Subject: [PATCH 11/17] nginxModules.push-stream: 0.5.4 -> 2020.05.03 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index af744d8c5729..c296434a6f71 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -280,8 +280,8 @@ in src = fetchFromGitHub { owner = "wandenberg"; repo = "nginx-push-stream-module"; - rev = "0.5.4"; - sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr"; + rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90"; + sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr"; }; }; From d3fdff5cbf9e33a1b6fda4305b478b4b1e84020a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:15:08 +0300 Subject: [PATCH 12/17] nginxModules.shibboleth: 2017.04.06 -> 2020.08.12 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c296434a6f71..dfe4aaede301 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -307,8 +307,8 @@ in src = fetchFromGitHub { owner = "nginx-shib"; repo = "nginx-http-shibboleth"; - rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; - sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27"; + sha256 = "1l0h3ic9mfsci89d0k5q3igkfpzq052ia25xj5hc8fq388yrhpap"; }; }; From e40dd8d4b95a2c213ad1b16969cc018af45454f7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:18:24 +0300 Subject: [PATCH 13/17] nginxModules.subsFilter: 2016.04.13 -> 2019.08.06 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index dfe4aaede301..e8f6d0ea9784 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -370,8 +370,8 @@ in src = fetchFromGitHub { owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; - rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b"; - sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar"; + rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0"; + sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f"; }; }; From b5c1848625bf597843f9a0c0def91d6909406263 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:21:44 +0300 Subject: [PATCH 14/17] nginxModules.upstream-check: 2018.08.12 -> 2019.11.03 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e8f6d0ea9784..5ce3b67879d3 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -388,8 +388,8 @@ in src = fetchFromGitHub { owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "007f76f7adbcbd6abd9352502af1a4ae463def85"; - sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in"; + rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e"; + sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l"; }; }; From 15b33307476f87f79f09990fac45ec568915bc92 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 12:38:42 +0300 Subject: [PATCH 15/17] nginxModules.statsd: change mirror --- pkgs/servers/http/nginx/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 5ce3b67879d3..99e4a2f3bebd 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -341,7 +341,7 @@ in statsd = { src = fetchFromGitHub { - owner = "apcera"; + owner = "harvesthq"; repo = "nginx-statsd"; rev = "b970e40467a624ba710c9a5106879a0554413d15"; sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; From 772f5d5401c496251d5f88188ec465c566ab74a6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 13:06:58 +0300 Subject: [PATCH 16/17] nginxModules: rename source to module name --- pkgs/servers/http/nginx/modules.nix | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 99e4a2f3bebd..a14f500c62bc 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -4,6 +4,7 @@ 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 = "96ae4e06381f821218f368ad0ba964f87cbe0266"; @@ -22,6 +23,7 @@ in brotli = { src = let gitsrc = pkgs.fetchFromGitHub { + name = "brotli"; owner = "google"; repo = "ngx_brotli"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; @@ -36,6 +38,7 @@ in cache-purge = { src = fetchFromGitHub { + name = "cache-purge"; owner = "nginx-modules"; repo = "ngx_cache_purge"; rev = "2.5.1"; @@ -45,6 +48,7 @@ in coolkit = { src = fetchFromGitHub { + name = "coolkit"; owner = "FRiCKLE"; repo = "ngx_coolkit"; rev = "0.2"; @@ -54,6 +58,7 @@ in dav = { src = fetchFromGitHub { + name = "dav"; owner = "arut"; repo = "nginx-dav-ext-module"; rev = "v3.0.0"; @@ -64,6 +69,7 @@ in develkit = { src = fetchFromGitHub { + name = "develkit"; owner = "vision5"; repo = "ngx_devel_kit"; rev = "v0.3.1"; @@ -73,6 +79,7 @@ in echo = { src = fetchFromGitHub { + name = "echo"; owner = "openresty"; repo = "echo-nginx-module"; rev = "v0.62"; @@ -82,6 +89,7 @@ in fancyindex = { src = fetchFromGitHub { + name = "fancyindex"; owner = "aperezdc"; repo = "ngx-fancyindex"; rev = "v0.4.4"; @@ -91,6 +99,7 @@ in fluentd = { src = fetchFromGitHub { + name = "fluentd"; owner = "fluent"; repo = "nginx-fluentd-module"; rev = "8af234043059c857be27879bc547c141eafd5c13"; @@ -108,6 +117,7 @@ in ipscrub = { src = fetchFromGitHub { + name = "ipscrub"; owner = "masonicboom"; repo = "ipscrub"; rev = "v1.0.1"; @@ -118,6 +128,7 @@ in limit-speed = { src = fetchFromGitHub { + name = "limit-speed"; owner = "yaoweibin"; repo = "nginx_limit_speed_module"; rev = "f77ad4a56fbb134878e75827b40cf801990ed936"; @@ -127,6 +138,7 @@ in live ={ src = fetchFromGitHub { + name = "live"; owner = "arut"; repo = "nginx-live-module"; rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd"; @@ -136,6 +148,7 @@ in lua = { src = fetchFromGitHub { + name = "lua"; owner = "openresty"; repo = "lua-nginx-module"; rev = "v0.10.15"; @@ -151,6 +164,7 @@ in lua-upstream = { src = fetchFromGitHub { + name = "lua-upstream"; owner = "openresty"; repo = "lua-upstream-nginx-module"; rev = "v0.07"; @@ -170,6 +184,7 @@ in modsecurity-nginx = { src = fetchFromGitHub { + name = "modsecurity-nginx"; owner = "SpiderLabs"; repo = "ModSecurity-nginx"; rev = "v1.0.1"; @@ -180,6 +195,7 @@ in moreheaders = { src = fetchFromGitHub { + name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.33"; @@ -189,6 +205,7 @@ in mpeg-ts ={ src = fetchFromGitHub { + name = "mpeg-ts"; owner = "arut"; repo = "nginx-ts-module"; rev = "v0.1.1"; @@ -198,6 +215,7 @@ in naxsi ={ src = fetchFromGitHub { + name = "naxsi"; owner = "nbs-system"; repo = "naxsi"; rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241"; @@ -207,6 +225,7 @@ in ngx_aws_auth = { src = fetchFromGitHub { + name = "ngx_aws_auth"; owner = "anomalizer"; repo = "ngx_aws_auth"; rev = "2.1.1"; @@ -217,6 +236,7 @@ in opentracing = { src = let src' = fetchFromGitHub { + name = "opentracing"; owner = "opentracing-contrib"; repo = "nginx-opentracing"; rev = "v0.9.0"; @@ -231,6 +251,7 @@ in version = pkgs.psol.version; moduleSrc = fetchFromGitHub { + name = "pagespeed"; owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-stable"; @@ -259,6 +280,7 @@ in pam = { src = fetchFromGitHub { + name = "pam"; owner = "stogh"; repo = "ngx_http_auth_pam_module"; rev = "v1.5.2"; @@ -269,6 +291,7 @@ in pinba = { src = fetchFromGitHub { + name = "pinba"; owner = "tony2001"; repo = "ngx_http_pinba_module"; rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6"; @@ -278,6 +301,7 @@ in push-stream ={ src = fetchFromGitHub { + name = "push-stream"; owner = "wandenberg"; repo = "nginx-push-stream-module"; rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90"; @@ -287,6 +311,7 @@ in rtmp ={ src = fetchFromGitHub { + name = "rtmp"; owner = "arut"; repo = "nginx-rtmp-module"; rev = "v1.2.1"; @@ -296,6 +321,7 @@ in set-misc = { src = fetchFromGitHub { + name = "set-misc"; owner = "openresty"; repo = "set-misc-nginx-module"; rev = "v0.32"; @@ -305,6 +331,7 @@ in shibboleth = { src = fetchFromGitHub { + name = "shibboleth"; owner = "nginx-shib"; repo = "nginx-http-shibboleth"; rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27"; @@ -314,6 +341,7 @@ in sla = { src = fetchFromGitHub { + name = "sla"; owner = "goldenclone"; repo = "nginx-sla"; rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; @@ -323,6 +351,7 @@ in slowfs-cache = { src = fetchFromGitHub { + name = "slowfs-cache"; owner = "FRiCKLE"; repo = "ngx_slowfs_cache"; rev = "1.10"; @@ -332,6 +361,7 @@ in sorted-querystring = { src = fetchFromGitHub { + name = "sorted-querystring"; owner = "wandenberg"; repo = "nginx-sorted-querystring-module"; rev = "0.3"; @@ -341,6 +371,7 @@ in statsd = { src = fetchFromGitHub { + name = "statsd"; owner = "harvesthq"; repo = "nginx-statsd"; rev = "b970e40467a624ba710c9a5106879a0554413d15"; @@ -350,6 +381,7 @@ in stream-sts = { src = fetchFromGitHub { + name = "stream-sts"; owner = "vozlt"; repo = "nginx-module-stream-sts"; rev = "v0.1.1"; @@ -359,6 +391,7 @@ in sts = { src = fetchFromGitHub { + name = "sts"; owner = "vozlt"; repo = "nginx-module-sts"; rev = "v0.1.1"; @@ -368,6 +401,7 @@ in subsFilter = { src = fetchFromGitHub { + name = "subsFilter"; owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0"; @@ -377,6 +411,7 @@ in sysguard = { src = fetchFromGitHub { + name = "sysguard"; owner = "vozlt"; repo = "nginx-module-sysguard"; rev = "e512897f5aba4f79ccaeeebb51138f1704a58608"; @@ -386,6 +421,7 @@ in upstream-check = { src = fetchFromGitHub { + name = "upstream-check"; owner = "yaoweibin"; repo = "nginx_upstream_check_module"; rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e"; @@ -395,6 +431,7 @@ in upstream-tarantool = { src = fetchFromGitHub { + name = "upstream-tarantool"; owner = "tarantool"; repo = "nginx_upstream_module"; rev = "v2.7.1"; @@ -405,6 +442,7 @@ in url = { src = fetchFromGitHub { + name = "url"; owner = "vozlt"; repo = "nginx-module-url"; rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e"; @@ -414,6 +452,7 @@ in video-thumbextractor = { src = fetchFromGitHub { + name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; rev = "0.9.0"; @@ -424,6 +463,7 @@ in vts = { src = fetchFromGitHub { + name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; rev = "v0.1.18"; From 5c70c5eeaa275aae90e1d3e5b63a6fdcf29bc850 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 16 Aug 2020 15:40:38 +0300 Subject: [PATCH 17/17] nginxModules: renamed module ngx_aws_auth to aws-auth --- nixos/doc/manual/release-notes/rl-2009.xml | 1 + pkgs/servers/http/nginx/modules.nix | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7485a6e7c10c..5a180f7a7603 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -910,6 +910,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Nginx module nginxModules.fastcgi-cache-purge renamed to official name nginxModules.cache-purge. + Nginx module nginxModules.ngx_aws_auth renamed to official name nginxModules.aws-auth. diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index a14f500c62bc..983e0f41ee91 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -20,6 +20,17 @@ 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 { @@ -223,16 +234,6 @@ in } + "/naxsi_src"; }; - ngx_aws_auth = { - src = fetchFromGitHub { - name = "ngx_aws_auth"; - owner = "anomalizer"; - repo = "ngx_aws_auth"; - rev = "2.1.1"; - sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; - }; - }; - opentracing = { src = let src' = fetchFromGitHub {