From 0d894d40bb0cc450ab55a48c7b63bbe504989202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Thu, 6 Mar 2025 16:31:01 +0000 Subject: [PATCH 1/2] nginxModules.njs: fix build --- pkgs/servers/http/nginx/modules.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 2565cfc465e6..004ba2a6b997 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,5 +1,6 @@ { lib , config +, nixosTests , fetchFromGitHub , fetchFromGitLab , fetchhg @@ -518,17 +519,19 @@ let self = { mkdir -p "$(dirname "$NJS_SOURCE_DIR")" cp --recursive "${src}" "$NJS_SOURCE_DIR" chmod -R u+rwX,go+rX "$NJS_SOURCE_DIR" - export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"}" + export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"} --with-ld-opt='-lz'" unset NJS_SOURCE_DIR ''; - inputs = [ which ]; + inputs = [ which zlib ]; + + passthru.tests = nixosTests.nginx-njs; meta = with lib; { description = "Subset of the JavaScript language that allows extending nginx functionality"; homepage = "https://nginx.org/en/docs/njs/"; license = with licenses; [ bsd2 ]; - maintainers = [ ]; + maintainers = with maintainers; [ jvanbruegge ]; }; }; From a907e4e08e295d1e5dfa1a6085bc09e8f8bde8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Thu, 6 Mar 2025 16:31:46 +0000 Subject: [PATCH 2/2] nginxModules.njs: 0.8.7 -> 0.8.9 --- 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 004ba2a6b997..c1babafac454 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -508,8 +508,8 @@ let self = { src = fetchFromGitHub { owner = "nginx"; repo = "njs"; - rev = "0.8.7"; - hash = "sha256-VEXzP+cN5hnDeniccwY7GIi4x460rnWO/o7ja3DyRCc="; + rev = "0.8.9"; + hash = "sha256-TalS9EJP+vB1o3BKaTvXXnudjKhNOcob3kDAyeKej3c="; }; # njs module sources have to be writable during nginx build, so we copy them