From df9ebaf8c7dda31cd42e6e897761abe98def7179 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Feb 2018 15:24:12 -0600 Subject: [PATCH 1/2] nginx/modules: use eustas' brotli module, google one is abandoned This fork is also used by FreeBSD as of Dec 2017: https://svnweb.freebsd.org/ports?view=revision&revision=455560 See also: https://github.com/google/ngx_brotli/issues/62 --- pkgs/servers/http/nginx/modules.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 780f20017982..40eba200c1f0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -2,13 +2,17 @@ { brotli = { - src = fetchFromGitHub { - owner = "google"; + src = let gitsrc = pkgs.fetchFromGitHub { + owner = "eustas"; repo = "ngx_brotli"; - rev = "bfd2885b2da4d763fed18f49216bb935223cd34b"; - sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n"; - fetchSubmodules = true; - }; + rev = "47550a25d07363f8eb87ef901b2de5883c46352b"; + sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6"; + }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' + cp -a ${gitsrc} $out + substituteInPlace $out/config \ + --replace /usr/local ${lib.getDev pkgs.brotli} + ''; + inputs = [ pkgs.brotli ]; }; rtmp ={ From 40b14109d34453b3178c637c9d33061ed3a5c579 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Feb 2018 14:07:12 -0600 Subject: [PATCH 2/2] nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule We have it use our system copy regardless, but might as well. (yes, hash does not change, since we don't fetch submodule here) --- 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 40eba200c1f0..32d1523547e6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,7 +5,7 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "47550a25d07363f8eb87ef901b2de5883c46352b"; + rev = "8cd9dd5fc232d3a01644584921e52dae99034779"; sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out