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

apache-httpd: enable brotli support by default #33481

Merged
merged 1 commit into from Jan 6, 2018
Merged

apache-httpd: enable brotli support by default #33481

merged 1 commit into from Jan 6, 2018

Conversation

ghost
Copy link

@ghost ghost commented Jan 5, 2018

Motivation for this change

Enable mod_brotli by default. Brotli is modern compression format.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@zimbatm
Copy link
Member

zimbatm commented Jan 6, 2018

@GrahamcOfBorg build apacheHttpd

@@ -4,13 +4,15 @@
, http2Support ? true, nghttp2
, ldapSupport ? true, openldap
, libxml2Support ? true, libxml2
, brotliSupport ? true, brotli ? null
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the purpose of the null default?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zimbatm I copied this pattern from the curl default.nix: https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/curl/default.nix#L11
I figured being explicit about arguments was a good idea. I'm still learning nix so am open to better patterns, idiom etc.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Since nix is lazily-evaluated it's not a problem to always pass brotli. curl is a bit special as it is used during the stdenv bootstrap where these libraries aren't available at all.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, thanks for the explanation. I'll PR to keep the style consistent.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or not. Thanks @orivej !

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/6754msz9wzarc36z7j99ni0m7kkly311-apache-httpd-2.4.29-man
gzipping man pages under /nix/store/6754msz9wzarc36z7j99ni0m7kkly311-apache-httpd-2.4.29-man/share/man/
strip is /nix/store/wxn5gn8amxm1w0ikcx4gbs8a17wvss4j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/6754msz9wzarc36z7j99ni0m7kkly311-apache-httpd-2.4.29-man
checking for references to /tmp/nix-build-apache-httpd-2.4.29.drv-0 in /nix/store/6754msz9wzarc36z7j99ni0m7kkly311-apache-httpd-2.4.29-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/h6zwai5p4mdmwwc2ksszka7j2yvygcny-apache-httpd-2.4.29-doc
strip is /nix/store/wxn5gn8amxm1w0ikcx4gbs8a17wvss4j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/h6zwai5p4mdmwwc2ksszka7j2yvygcny-apache-httpd-2.4.29-doc
checking for references to /tmp/nix-build-apache-httpd-2.4.29.drv-0 in /nix/store/h6zwai5p4mdmwwc2ksszka7j2yvygcny-apache-httpd-2.4.29-doc...
/nix/store/glqdndz4x8h005qfjwf1cy60g9r7cvqk-apache-httpd-2.4.29

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-darwin

patching script interpreter paths in /nix/store/bhqdhkxcp8xaqsr0k6y3z4idvml65ccw-apache-httpd-2.4.29-dev
/nix/store/bhqdhkxcp8xaqsr0k6y3z4idvml65ccw-apache-httpd-2.4.29-dev/share/build/mkdir.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hgsbnqhg7zr5vbjazb250ac4wnj3cfhy-bash-4.4-p12/bin/sh"
/nix/store/bhqdhkxcp8xaqsr0k6y3z4idvml65ccw-apache-httpd-2.4.29-dev/share/build/instdso.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hgsbnqhg7zr5vbjazb250ac4wnj3cfhy-bash-4.4-p12/bin/sh"
/nix/store/bhqdhkxcp8xaqsr0k6y3z4idvml65ccw-apache-httpd-2.4.29-dev/share/build/config.nice: interpreter directive changed from " /bin/sh" to "/nix/store/hgsbnqhg7zr5vbjazb250ac4wnj3cfhy-bash-4.4-p12/bin/sh"
gzipping man pages under /nix/store/4nnmfx9dn23dd9crg1hnd40bvr93d07w-apache-httpd-2.4.29-man/share/man/
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/4nnmfx9dn23dd9crg1hnd40bvr93d07w-apache-httpd-2.4.29-man
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/1i2y31a5fdlfjas2hd48id5vi8rfd9bi-apache-httpd-2.4.29-doc
/nix/store/p2k95k6cf3mclwgs5vx4apdzzdn73wcr-apache-httpd-2.4.29

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: aarch64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/88m6lvyrxqwmbjf5x3icgk2fzn0jm1m2-apache-httpd-2.4.29-man
gzipping man pages under /nix/store/88m6lvyrxqwmbjf5x3icgk2fzn0jm1m2-apache-httpd-2.4.29-man/share/man/
strip is /nix/store/c6qj0j45xizkrx58i65j75a5ysmqhgrs-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/88m6lvyrxqwmbjf5x3icgk2fzn0jm1m2-apache-httpd-2.4.29-man
checking for references to /build in /nix/store/88m6lvyrxqwmbjf5x3icgk2fzn0jm1m2-apache-httpd-2.4.29-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/7g54dv4rwwh87va92zgr03q6v59p5mdm-apache-httpd-2.4.29-doc
strip is /nix/store/c6qj0j45xizkrx58i65j75a5ysmqhgrs-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/7g54dv4rwwh87va92zgr03q6v59p5mdm-apache-httpd-2.4.29-doc
checking for references to /build in /nix/store/7g54dv4rwwh87va92zgr03q6v59p5mdm-apache-httpd-2.4.29-doc...
/nix/store/syf96c6y5gqa618i3l12g1527i5laiy4-apache-httpd-2.4.29

@globin globin merged commit f95d92e into NixOS:master Jan 6, 2018
@ghost ghost deleted the topic-apache-brotli branch January 6, 2018 18:30
orivej added a commit that referenced this pull request Jan 6, 2018
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.

None yet

4 participants