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.

Sign up for GitHub

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

Jump to bottom

tengine: init init at v2.2.2 #44146

Merged
merged 2 commits into from Aug 8, 2018
Merged

tengine: init init at v2.2.2 #44146

merged 2 commits into from Aug 8, 2018

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Jul 27, 2018 •
edited

Motivation for this change

Add web server tengine.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

xeji
xeji reviewed Aug 5, 2018
View reviewed changes
pkgs/servers/http/tengine/default.nix Outdated
, gd, geoip
, withDebug ? false
, withMail ? false
, withIPv6 ? false
Copy link
Contributor

Choose a reason for hiding this comment

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

Why disable IPv6? I believe that any server application should support IPv6 by default.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, fixed.

pkgs/top-level/all-packages.nix Outdated
@@ -19954,6 +19954,11 @@ with pkgs;

teeworlds = callPackage ../games/teeworlds { };

tengine = callPackage ../servers/http/tengine {
stdenv = overrideCC stdenv gcc6;
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.modsecurity-nginx];
Copy link
Contributor

Choose a reason for hiding this comment

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

with nginxModules; [ rtmp dav ... ]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tengine support build with nginx modules

pkgs/top-level/all-packages.nix Outdated
@@ -19954,6 +19954,11 @@ with pkgs;

teeworlds = callPackage ../games/teeworlds { };

tengine = callPackage ../servers/http/tengine {
stdenv = overrideCC stdenv gcc6;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this necessary? Did you try to build with default gcc7 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Error build with gcc7.

@xeji
Copy link
Contributor

xeji commented Aug 7, 2018

@Izorkin i added a commit to fix the build with gcc7 so we do not need to use gcc6. Please test.

@Izorkin
Copy link
Contributor Author

Izorkin commented Aug 8, 2018

Thanks. Works.

@xeji
Copy link
Contributor

xeji commented Aug 8, 2018

@GrahamcOfBorg build tengine

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tengine

Partial log (click to expand)

test -f 'objs/ngx_auto_config.h' && cp 'objs/ngx_auto_config.h' '/nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2/include'
make[1]: Leaving directory '/build/tengine-tengine-2.2.2'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2
shrinking /nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2/bin/nginx
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2/bin
patching script interpreter paths in /nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2
/nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2/bin/dso_tool: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/5chz7isvbhb5jd2nl9ilj31b80m0vh9d-tengine-2.2.2...

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: tengine

Partial log (click to expand)

checking for TCP_INFO ... found
checking for accept4() ... found
checking for kqueue AIO support ... not found
checking for Linux AIO support ... not found

./configure: no supported file AIO was found
Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only

builder for '/nix/store/5mv5k0hk08ppiz2izhci05yz8iz42f41-tengine-2.2.2.drv' failed with exit code 1
error: build of '/nix/store/5mv5k0hk08ppiz2izhci05yz8iz42f41-tengine-2.2.2.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: tengine

Partial log (click to expand)

test -f 'src/http/modules/ngx_http_ssl_module.h' && cp 'src/http/modules/ngx_http_ssl_module.h' '/nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/include'
test -f 'src/http/modules/ngx_http_reqstat.h' && cp 'src/http/modules/ngx_http_reqstat.h' '/nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/include'
test -f 'objs/ngx_auto_headers.h'  && cp 'objs/ngx_auto_headers.h' '/nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/include'
test -f 'objs/ngx_auto_config.h' && cp 'objs/ngx_auto_config.h' '/nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/include'
make[1]: Leaving directory '/private/tmp/nix-build-tengine-2.2.2.drv-0/tengine-tengine-2.2.2'
post-installation fixup
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/bin
patching script interpreter paths in /nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2
/nix/store/gpz1sh6c7b7ahqc2c2ah56knbyj1d9r3-tengine-2.2.2/bin/dso_tool: interpreter directive changed from "/bin/sh" to "/nix/store/qb76s7s3p6pnsi7082sjfc7rb64f3s6a-bash-4.4-p23/bin/sh"

@xeji
Copy link
Contributor

xeji commented Aug 8, 2018

aarch64 failure can be fixed later by someone familiar with the platform.

@xeji xeji merged commit 90e72bb into NixOS:master Aug 8, 2018
@Izorkin Izorkin deleted the tengine branch August 8, 2018 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Izorkin @xeji @GrahamcOfBorg