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

{openresty,nginxModules.brotli}: updates and improvements #77804

Merged
merged 2 commits into from Feb 5, 2020

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Jan 16, 2020

Motivation for this change

This updates the ngx_brotli module to the latest upstream version, and also rebases the openresty package on top of the nginx/generic.nix infrastructure, simplifying things considerably and allowing the use of third-party modules with OpenResty.

I haven't tested this extensively yet, but the build completes successfully for me and the OpenResty codebase is just a distribution of nginx, so I think it should be pretty low-risk. nix build '(with (import ./. {}); openresty.override { modules = with nginxModules; [ brotli ]; })' builds successfully with these changes.

cc @thoughtpolice does this look reasonable to you?

@GrahamcOfBorg build nginx openresty

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@ofborg ofborg bot requested review from lblasc, fpletz, globin, 7c6f434c and thoughtpolice Jan 16, 2020
@emilazy emilazy force-pushed the emilazy:openresty-module-support branch from 32dc395 to 885c3ea Jan 17, 2020
@emilazy
Copy link
Member Author

@emilazy emilazy commented Jan 17, 2020

It turns out that naming a parameter src causes exciting breakage when you callPackage it (because pkgs.src exists); I broke the nginx build.

Let's try that again...

@GrahamcOfBorg build nginx openresty

@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Feb 4, 2020

Sorry for the delay reviewing this @emilazy -- yes, these changes look pretty good! Please rebase (it looks like there's just been a trivial update to nginxMainline) and I'll merge, sorry for the delay here.

emilazy added 2 commits Jan 16, 2020
The fork was merged back upstream but has yet to see a formal release.
The primary motivation of this change was to allow third-party modules
to be used with OpenResty, but it also results in a significant
reduction of code duplication.
@emilazy emilazy force-pushed the emilazy:openresty-module-support branch from 885c3ea to a989fe2 Feb 4, 2020
@emilazy
Copy link
Member Author

@emilazy emilazy commented Feb 4, 2020

should be good now :)

@GrahamcOfBorg build nginx openresty

@ofborg ofborg bot requested a review from thoughtpolice Feb 4, 2020
@lblasc
lblasc approved these changes Feb 4, 2020
@thoughtpolice thoughtpolice merged commit 6d046e1 into NixOS:master Feb 5, 2020
17 checks passed
17 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
nginx, openresty on aarch64-linux Success
Details
nginx, openresty on x86_64-linux Success
Details
openresty on aarch64-linux Success
Details
openresty on x86_64-linux Success
Details
@emilazy emilazy deleted the emilazy:openresty-module-support branch Feb 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.