-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nginx: fix compatibility with zlib-ng #358812
Conversation
Small fix: diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 12c3e2ed6302..c576031da8ea 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation {
'';
})
./nix-skip-check-logs-path.patch
- ] ++ lib.optionals (lib.elem pname ["nginx" "angie"]) [
+ ] ++ lib.optionals (lib.elem pname [ "angie" "angieQuic" "nginx" "nginxQuic" ]) [
# https://github.com/NixOS/nixpkgs/issues/357522
# https://github.com/zlib-ng/patches/blob/5a036c0a00120c75ee573b27f4f44ade80d82ff2/nginx/README.md
(fetchpatch {
|
Thanks for the hint! I think I'll just reverse the pname check because the only incompatible variant is actually |
There's also |
902e6da
to
2977a79
Compare
|
I was thinking of redesigning it to use generic |
2977a79
to
5ae0b27
Compare
Pushed another small fix for Darwin. |
ofborg stuck again. 😿 |
Successfully created backport PR for |
Fix #357522.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.