Skip to content
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

Merged
merged 1 commit into from
Nov 27, 2024

Conversation

fpletz
Copy link
Member

@fpletz fpletz commented Nov 24, 2024

Fix #357522.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Izorkin
Copy link
Contributor

Izorkin commented Nov 25, 2024

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 {

@fpletz
Copy link
Member Author

fpletz commented Nov 25, 2024

Thanks for the hint! I think I'll just reverse the pname check because the only incompatible variant is actually openresty.

@Izorkin
Copy link
Contributor

Izorkin commented Nov 25, 2024

There's also tengine package.

@fpletz fpletz force-pushed the pkgs/nginx-fix-zlib-ng branch from 902e6da to 2977a79 Compare November 25, 2024 16:48
@fpletz
Copy link
Member Author

fpletz commented Nov 25, 2024

There's also tengine package.

tengine doesn't actually use the generic nginx expression and depends on regular zlib anyway. 😏

@Izorkin
Copy link
Contributor

Izorkin commented Nov 25, 2024

I was thinking of redesigning it to use generic nginx.

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Nov 25, 2024
@ofborg ofborg bot requested review from Izorkin and dasJ November 26, 2024 11:59
@fpletz fpletz force-pushed the pkgs/nginx-fix-zlib-ng branch from 2977a79 to 5ae0b27 Compare November 26, 2024 19:35
@fpletz
Copy link
Member Author

fpletz commented Nov 26, 2024

Pushed another small fix for Darwin.

@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Nov 26, 2024
@fpletz
Copy link
Member Author

fpletz commented Nov 27, 2024

ofborg stuck again. 😿

@fpletz fpletz merged commit 352dc5c into NixOS:master Nov 27, 2024
16 of 17 checks passed
@fpletz fpletz deleted the pkgs/nginx-fix-zlib-ng branch November 27, 2024 13:34
Copy link
Contributor

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

nginx: gzip filter failed to use preallocated memory: 350336 of 336176
5 participants