@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, lib, pkgs }:
1+{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }:
22
33let
44
@@ -33,6 +33,29 @@ in
3333 inputs = [ pkgs.openssl ];
3434 };
3535
36+ auth-a2aclr = {
37+ src = fetchFromGitLab {
38+ name = "auth-a2aclr";
39+ owner = "arpa2";
40+ repo = "nginx-auth-a2aclr";
41+ rev = "bbabf9480bb2b40ac581551883a18dfa6522dd63";
42+ sha256 = "sha256-h2LgMhreCgod+H/bNQzY9BvqG9ezkwikwWB3T6gHH04=";
43+ };
44+ inputs = [
45+ (pkgs.arpa2common.overrideAttrs
46+ (old: rec {
47+ version = "0.7.1";
48+
49+ src = fetchFromGitLab {
50+ owner = "arpa2";
51+ repo = "arpa2common";
52+ rev = "v${version}";
53+ sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64=";
54+ };
55+ }))
56+ ];
57+ };
58+
3659 aws-auth = {
3760 src = fetchFromGitHub {
3861 name = "aws-auth";
@@ -50,20 +73,21 @@ in
5073 repo = "ngx_brotli";
5174 rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
5275 sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv";
53− }; in pkgs.runCommand "ngx_brotli-src" {} ''
54− cp -a ${gitsrc} $out
55− substituteInPlace $out/filter/config \
56− --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
57− '';
76+ }; in
77+ pkgs.runCommand "ngx_brotli-src" { } ''
78+ cp -a ${gitsrc} $out
79+ substituteInPlace $out/filter/config \
80+ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
81+ '';
5882 inputs = [ pkgs.brotli ];
5983 };
6084
6185 cache-purge = {
6286 src = fetchFromGitHub {
6387 name = "cache-purge";
64− owner = "nginx-modules";
65− repo = "ngx_cache_purge";
66− rev = "2.5.1";
88+ owner = "nginx-modules";
89+ repo = "ngx_cache_purge";
90+ rev = "2.5.1";
6791 sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
6892 };
6993 };
@@ -71,9 +95,9 @@ in
7195 coolkit = {
7296 src = fetchFromGitHub {
7397 name = "coolkit";
74− owner = "FRiCKLE";
75− repo = "ngx_coolkit";
76− rev = "0.2";
98+ owner = "FRiCKLE";
99+ repo = "ngx_coolkit";
100+ rev = "0.2";
77101 sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
78102 };
79103 };
@@ -141,13 +165,14 @@ in
141165 };
142166
143167 ipscrub = {
144− src = fetchFromGitHub {
145− name = "ipscrub";
146− owner = "masonicboom";
147− repo = "ipscrub";
148− rev = "v1.0.1";
149− sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
150− } + "/ipscrub";
168+ src = fetchFromGitHub
169+ {
170+ name = "ipscrub";
171+ owner = "masonicboom";
172+ repo = "ipscrub";
173+ rev = "v1.0.1";
174+ sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
175+ } + "/ipscrub";
151176 inputs = [ pkgs.libbsd ];
152177 };
153178
@@ -161,7 +186,7 @@ in
161186 };
162187 };
163188
164− live ={
189+ live = {
165190 src = fetchFromGitHub {
166191 name = "live";
167192 owner = "arut";
@@ -228,7 +253,7 @@ in
228253 };
229254 };
230255
231− mpeg-ts ={
256+ mpeg-ts = {
232257 src = fetchFromGitHub {
233258 name = "mpeg-ts";
234259 owner = "arut";
@@ -238,14 +263,15 @@ in
238263 };
239264 };
240265
241− naxsi ={
242− src = fetchFromGitHub {
243− name = "naxsi";
244− owner = "nbs-system";
245− repo = "naxsi";
246− rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
247− sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
248− } + "/naxsi_src";
266+ naxsi = {
267+ src = fetchFromGitHub
268+ {
269+ name = "naxsi";
270+ owner = "nbs-system";
271+ repo = "naxsi";
272+ rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
273+ sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
274+ } + "/naxsi_src";
249275 };
250276
251277 opentracing = {
@@ -266,10 +292,10 @@ in
266292 version = pkgs.psol.version;
267293
268294 moduleSrc = fetchFromGitHub {
269− name = "pagespeed";
270− owner = "pagespeed";
271− repo = "ngx_pagespeed";
272− rev = "v${version}-stable";
295+ name = "pagespeed";
296+ owner = "pagespeed";
297+ repo = "ngx_pagespeed";
298+ rev = "v${version}-stable";
273299 sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
274300 };
275301
@@ -278,8 +304,8 @@ in
278304 {
279305 meta = {
280306 description = "PageSpeed module for Nginx";
281− homepage = "https://developers.google.com/speed/pagespeed/module/";
282− license = pkgs.lib.licenses.asl20;
307+ homepage = "https://developers.google.com/speed/pagespeed/module/";
308+ license = pkgs.lib.licenses.asl20;
283309 };
284310 }
285311 ''
@@ -287,7 +313,8 @@ in
287313 chmod -R +w "$out"
288314 ln -s "${pkgs.psol}" "$out/psol"
289315 '';
290− in {
316+ in
317+ {
291318 src = ngx_pagespeed;
292319 inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
293320 allowMemoryWriteExecute = true;
@@ -314,7 +341,7 @@ in
314341 };
315342 };
316343
317− push-stream ={
344+ push-stream = {
318345 src = fetchFromGitHub {
319346 name = "push-stream";
320347 owner = "wandenberg";
@@ -378,9 +405,9 @@ in
378405 slowfs-cache = {
379406 src = fetchFromGitHub {
380407 name = "slowfs-cache";
381− owner = "FRiCKLE";
382− repo = "ngx_slowfs_cache";
383− rev = "1.10";
408+ owner = "FRiCKLE";
409+ repo = "ngx_slowfs_cache";
410+ rev = "1.10";
384411 sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
385412 };
386413 };