@@ -50,20 +50,21 @@ in
5050 repo = "ngx_brotli";
5151 rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
5252 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− '';
53+ }; in
54+ pkgs.runCommand "ngx_brotli-src" { } ''
55+ cp -a ${gitsrc} $out
56+ substituteInPlace $out/filter/config \
57+ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
58+ '';
5859 inputs = [ pkgs.brotli ];
5960 };
6061
6162 cache-purge = {
6263 src = fetchFromGitHub {
6364 name = "cache-purge";
64− owner = "nginx-modules";
65− repo = "ngx_cache_purge";
66− rev = "2.5.1";
65+ owner = "nginx-modules";
66+ repo = "ngx_cache_purge";
67+ rev = "2.5.1";
6768 sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
6869 };
6970 };
@@ -71,9 +72,9 @@ in
7172 coolkit = {
7273 src = fetchFromGitHub {
7374 name = "coolkit";
74− owner = "FRiCKLE";
75− repo = "ngx_coolkit";
76− rev = "0.2";
75+ owner = "FRiCKLE";
76+ repo = "ngx_coolkit";
77+ rev = "0.2";
7778 sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
7879 };
7980 };
@@ -138,13 +139,14 @@ in
138139 };
139140
140141 ipscrub = {
141− src = fetchFromGitHub {
142− name = "ipscrub";
143− owner = "masonicboom";
144− repo = "ipscrub";
145− rev = "v1.0.1";
146− sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
147− } + "/ipscrub";
142+ src = fetchFromGitHub
143+ {
144+ name = "ipscrub";
145+ owner = "masonicboom";
146+ repo = "ipscrub";
147+ rev = "v1.0.1";
148+ sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
149+ } + "/ipscrub";
148150 inputs = [ pkgs.libbsd ];
149151 };
150152
@@ -158,7 +160,7 @@ in
158160 };
159161 };
160162
161− live ={
163+ live = {
162164 src = fetchFromGitHub {
163165 name = "live";
164166 owner = "arut";
@@ -225,7 +227,7 @@ in
225227 };
226228 };
227229
228− mpeg-ts ={
230+ mpeg-ts = {
229231 src = fetchFromGitHub {
230232 name = "mpeg-ts";
231233 owner = "arut";
@@ -235,14 +237,15 @@ in
235237 };
236238 };
237239
238− naxsi ={
239− src = fetchFromGitHub {
240− name = "naxsi";
241− owner = "nbs-system";
242− repo = "naxsi";
243− rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
244− sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
245− } + "/naxsi_src";
240+ naxsi = {
241+ src = fetchFromGitHub
242+ {
243+ name = "naxsi";
244+ owner = "nbs-system";
245+ repo = "naxsi";
246+ rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
247+ sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
248+ } + "/naxsi_src";
246249 };
247250
248251 opentracing = {
@@ -263,10 +266,10 @@ in
263266 version = pkgs.psol.version;
264267
265268 moduleSrc = fetchFromGitHub {
266− name = "pagespeed";
267− owner = "pagespeed";
268− repo = "ngx_pagespeed";
269− rev = "v${version}-stable";
269+ name = "pagespeed";
270+ owner = "pagespeed";
271+ repo = "ngx_pagespeed";
272+ rev = "v${version}-stable";
270273 sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
271274 };
272275
@@ -275,8 +278,8 @@ in
275278 {
276279 meta = {
277280 description = "PageSpeed module for Nginx";
278− homepage = "https://developers.google.com/speed/pagespeed/module/";
279− license = pkgs.lib.licenses.asl20;
281+ homepage = "https://developers.google.com/speed/pagespeed/module/";
282+ license = pkgs.lib.licenses.asl20;
280283 };
281284 }
282285 ''
@@ -284,7 +287,8 @@ in
284287 chmod -R +w "$out"
285288 ln -s "${pkgs.psol}" "$out/psol"
286289 '';
287− in {
290+ in
291+ {
288292 src = ngx_pagespeed;
289293 inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
290294 allowMemoryWriteExecute = true;
@@ -311,7 +315,7 @@ in
311315 };
312316 };
313317
314− push-stream ={
318+ push-stream = {
315319 src = fetchFromGitHub {
316320 name = "push-stream";
317321 owner = "wandenberg";
@@ -375,9 +379,9 @@ in
375379 slowfs-cache = {
376380 src = fetchFromGitHub {
377381 name = "slowfs-cache";
378− owner = "FRiCKLE";
379− repo = "ngx_slowfs_cache";
380− rev = "1.10";
382+ owner = "FRiCKLE";
383+ repo = "ngx_slowfs_cache";
384+ rev = "1.10";
381385 sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
382386 };
383387 };