From 7a5d93806722db08ee21063f8bb5b91aa78f7435 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 21:33:18 +0300 Subject: [PATCH 01/14] nginxModules.http_proxy_connect_module: 05.09.2018 -> 16.04.2019 --- pkgs/servers/http/nginx/modules.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 6a0114a6ba55..bb053449583f 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 = "8201639082cba702211585b03d4cc7bc51c65167"; - sha256 = "0z71x3xnlczrr2kq43w3drxj9g14fkk4jz66x921v0yb8r9mnn5a"; + rev = "18e2520b361ffebde6c08c8119ecfba113a3b53c"; + sha256 = "1nyil5n2a97nqsqarvnp4bazw4vnxifqizzw5aank4vi9xlq90b2"; }; patches = [ @@ -87,6 +87,14 @@ in }; }; + http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // { + supports = with lib.versions; version: major version == "1" && minor version == "15"; + }; + + http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // { + supports = with lib.versions; version: major version == "1" && minor version == "14"; + }; + ipscrub = { src = fetchFromGitHub { owner = "masonicboom"; @@ -335,12 +343,4 @@ in sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7"; }; }; - - http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // { - supports = with lib.versions; version: major version == "1" && minor version == "15"; - }; - - http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // { - supports = with lib.versions; version: major version == "1" && minor version == "14"; - }; } From b0dc2d61066b533857ea3c6add511edadad97081 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 21:40:09 +0300 Subject: [PATCH 02/14] nginxModules.dav: 0.1.0 -> 3.0.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 bb053449583f..fe357fe46ded 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -36,8 +36,8 @@ in src = fetchFromGitHub { owner = "arut"; repo = "nginx-dav-ext-module"; - rev = "v0.1.0"; - sha256 = "1ifahd69vz715g3zim618jbmxb7kcmzykc696grskxm0svpy294k"; + rev = "v3.0.0"; + sha256 = "000dm5zk0m1hm1iq60aff5r6y8xmqd7djrwhgnz9ig01xyhnjv9w"; }; inputs = [ pkgs.expat ]; }; From c940a7caa091af54a9e018f6290f8aa00a2cef04 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 21:46:45 +0300 Subject: [PATCH 03/14] nginxModules.live: init at 18.11.2018 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index fe357fe46ded..e96d04de42a6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -105,6 +105,15 @@ in inputs = [ pkgs.libbsd ]; }; + live ={ + src = fetchFromGitHub { + owner = "arut"; + repo = "nginx-live-module"; + rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd"; + sha256 = "1kpnhl4b50zim84z22ahqxyxfq4jv8ab85kzsy2n5ciqbyg491lz"; + }; + }; + lua = { src = fetchFromGitHub { owner = "openresty"; From 89a73423abcb93a1d1fcfff04d12789155dad16f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 21:54:07 +0300 Subject: [PATCH 04/14] nginxModules.mpeg-ts: init at 0.1.1 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e96d04de42a6..abf15ab5febf 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -165,6 +165,15 @@ in }; }; + mpeg-ts ={ + src = fetchFromGitHub { + owner = "arut"; + repo = "nginx-ts-module"; + rev = "v0.1.1"; + sha256 = "12dxcyy6wna1fccl3a9lnsbymd6p4apnwz6c24w74v97qvpfdxqd"; + }; + }; + ngx_aws_auth = { src = fetchFromGitHub { owner = "anomalizer"; From 8c1131ef28cf5bdb7247721b7779f735d0d57bd6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 22:11:34 +0300 Subject: [PATCH 05/14] nginxModules.lua: 0.10.13 -> 0.10.14 --- 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 abf15ab5febf..8b68e985f77e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -118,8 +118,8 @@ in src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.10.13"; - sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822"; + rev = "v0.10.14"; + sha256 = "1vg6pp9n8z42p6f3jqk15gvdyy7mfvs5ssfbiy83bydjx42fq7g0"; }; inputs = [ pkgs.luajit ]; preConfigure = '' From 80666e68b2e4c465bb01d5825290d120aadb1a38 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 22:28:22 +0300 Subject: [PATCH 06/14] nginxModules.slowfs-cache: init at 1.10 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 8b68e985f77e..e197443e7208 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -280,6 +280,15 @@ in }; }; + slowfs-cache = { + src = fetchFromGitHub { + owner = "FRiCKLE"; + repo = "ngx_slowfs_cache"; + rev = "1.10"; + sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr"; + }; + }; + statsd = { src = fetchFromGitHub { owner = "apcera"; From d66b94da6246221d101eeb2b41e98634aa6642c0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 22:35:55 +0300 Subject: [PATCH 07/14] nginxModules.coolkit: init at 0.2 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e197443e7208..359718b316a5 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -32,6 +32,15 @@ in inputs = [ pkgs.brotli ]; }; + coolkit = { + src = fetchFromGitHub { + owner = "FRiCKLE"; + repo = "ngx_coolkit"; + rev = "0.2"; + sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh"; + }; + }; + dav = { src = fetchFromGitHub { owner = "arut"; From 6a154d00c35e4390a41b1cc2e60956c22d5f6e48 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 23:08:55 +0300 Subject: [PATCH 08/14] nginxModules.upstream-check: 10.11.2017 -> 12.08.2018 --- 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 359718b316a5..e189d86495a7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -347,8 +347,8 @@ in src = fetchFromGitHub { owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04"; - sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; + rev = "007f76f7adbcbd6abd9352502af1a4ae463def85"; + sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in"; }; }; From d1dff5a9eca2929cb78b942a27e718b1926af20a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Apr 2019 23:11:08 +0300 Subject: [PATCH 09/14] nginxModules.upstream-tarantool: 2.7 -> 2.7.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 e189d86495a7..39432f4a28ad 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -356,8 +356,8 @@ in src = fetchFromGitHub { owner = "tarantool"; repo = "nginx_upstream_module"; - rev = "v2.7"; - sha256 = "05dwj0caj910p7kan2qjvm6x2x601igryhny2xzr47hhsk5q1cnx"; + rev = "v2.7.1"; + sha256 = "0ya4330in7zjzqw57djv4icpk0n1j98nvf0f8v296yi9rjy054br"; }; inputs = [ pkgs.msgpuck.dev pkgs.yajl ]; }; From 13c938ac1e7701e1f0360325ce5fdc767c84dd4d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 21 Apr 2019 10:21:44 +0300 Subject: [PATCH 10/14] nginxModules.subsFilter: 0.6.4 -> 13.04.2016 --- 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 39432f4a28ad..e3fb728e71a7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -329,8 +329,8 @@ in src = fetchFromGitHub { owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; - rev = "v0.6.4"; - sha256 = "0q86cv0mfffh43id5xanywyhpd7b0jijrmk8y311c13l9ajrd2rx"; + rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b"; + sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar"; }; }; From b329187524158020046f8fcae5d9e7ac7f0c9309 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 21 Apr 2019 10:27:31 +0300 Subject: [PATCH 11/14] nginxModules.limit-speed: init at 21.05.2014 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e3fb728e71a7..47c1d99611fb 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -114,6 +114,15 @@ in inputs = [ pkgs.libbsd ]; }; + limit-speed = { + src = fetchFromGitHub { + owner = "yaoweibin"; + repo = "nginx_limit_speed_module"; + rev = "f77ad4a56fbb134878e75827b40cf801990ed936"; + sha256 = "0kkrd08zpcwx938i2is07vq6pgjkvn97xzjab0g4zaz8bivgmjp8"; + }; + }; + live ={ src = fetchFromGitHub { owner = "arut"; From f6525448a5cc78a8e5ac5c6e5cdc9aa045bde705 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 21 Apr 2019 10:30:29 +0300 Subject: [PATCH 12/14] nginxModules.sorted-querystring: init at 0.3 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 47c1d99611fb..152ebdf04c38 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -307,6 +307,15 @@ in }; }; + sorted-querystring = { + src = fetchFromGitHub { + owner = "wandenberg"; + repo = "nginx-sorted-querystring-module"; + rev = "0.3"; + sha256 = "0p6b0hcws39n27fx4xp9k4hb3pcv7b6kah4qqaj0pzjy3nbp4gj7"; + }; + }; + statsd = { src = fetchFromGitHub { owner = "apcera"; From 6600d00ed149e3d12ca00fb03db8faab910f3138 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 21 Apr 2019 10:32:46 +0300 Subject: [PATCH 13/14] nginxModules.video-thumbextractor: init at 0.9.0 --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 152ebdf04c38..deaa514eeedf 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -389,6 +389,16 @@ in }; }; + video-thumbextractor = { + src = fetchFromGitHub { + owner = "wandenberg"; + repo = "nginx-video-thumbextractor-module"; + rev = "0.9.0"; + sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7"; + }; + inputs = [ pkgs.ffmpeg ]; + }; + vts = { src = fetchFromGitHub { owner = "vozlt"; From 452cf0b3e21050ccb72c0cc1245b54286a6d283a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 21 Apr 2019 11:10:49 +0300 Subject: [PATCH 14/14] nginxModules.naxsi: init at 0.56 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index deaa514eeedf..347ac2903787 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -192,6 +192,15 @@ in }; }; + naxsi ={ + src = fetchFromGitHub { + owner = "nbs-system"; + repo = "naxsi"; + rev = "0.56"; + sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v"; + } + "/naxsi_src"; + }; + ngx_aws_auth = { src = fetchFromGitHub { owner = "anomalizer";