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

nginxQuic package and boringssl update #119813

Merged
merged 3 commits into from
Apr 19, 2021
Merged

nginxQuic package and boringssl update #119813

merged 3 commits into from
Apr 19, 2021

Conversation

mkg20001
Copy link
Member

Motivation for this change

Adds nginxQuic from https://quic.nginx.org/ and an option to use it in vhosts (vhost.http3 = true;)

Also updates boringssl to a newer version that supports h3 (and some changes as go modules need to be fetched now)

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 18, 2021
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Apr 18, 2021
@ofborg ofborg bot requested review from thoughtpolice and kalbasit April 18, 2021 17:06
SuperSandro2000
SuperSandro2000 reviewed Apr 18, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Some ideas I had while reading. Good idea.

nixos/modules/services/web-servers/nginx/vhost-options.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-servers/nginx/vhost-options.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-servers/nginx/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/boringssl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/boringssl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/boringssl/default.nix
Comment on lines +26 to +33
preBuild = ''
cmakeConfigurePhase
'';

buildPhase = ''
ninjaBuildPhase
'';
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't those be invoked automatically?

Copy link
Member Author

Choose a reason for hiding this comment

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

buildGoModule overwrites them

pkgs/top-level/all-packages.nix Show resolved Hide resolved
pkgs/top-level/all-packages.nix Show resolved Hide resolved
@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 18, 2021 •
edited
Loading

Result of nixpkgs-review pr 119813 at dc1214dc run on x86_64-linux 1

12 packages marked as broken and skipped:
  • python38Packages.arviz
  • python38Packages.dm-sonnet
  • python38Packages.graph_nets
  • python38Packages.optuna
  • python38Packages.pymc3
  • python38Packages.rl-coach
  • python38Packages.tensorflow-probability
  • python39Packages.dm-sonnet
  • python39Packages.graph_nets
  • python39Packages.optuna
  • ...
2 packages failed to build:
16 packages skipped due to time constraints:
  • gpt2tc
  • python38Packages.baselines
  • python38Packages.edward
  • python38Packages.mask-rcnn
  • python38Packages.scikit-tda
  • python38Packages.tensorflow (python38Packages.tensorflow-build ,python38Packages.tensorflow-build_2 ,python38Packages.tensorflowWithoutCuda ,python38Packages.tensorflow_2)
  • python38Packages.tensorflowWithCuda
  • python38Packages.tflearn
  • python38Packages.umap-learn
  • python39Packages.baselines
  • ...
2 suggestions:
  • warning: missing-phase-hooks

    buildPhase should probably contain runHook preBuild.

    Near pkgs/development/go-modules/generic/default.nix:145:5:

        |
145 |     buildPhase = args.buildPhase or ''
    |     ^
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/development/go-modules/generic/default.nix:220:5:

        |
220 |     installPhase = args.installPhase or ''
    |     ^

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Result of nixpkgs-review pr 119813 at 9530794 run on aarch64-linux 1

14 packages marked as broken and skipped:
  • python38Packages.arviz
  • python38Packages.dm-sonnet
  • python38Packages.graph_nets
  • python38Packages.optuna
  • python38Packages.pymc3
  • python38Packages.rl-coach
  • python38Packages.tensorflow-probability
  • python38Packages.tensorflowWithCuda
  • python39Packages.dm-sonnet
  • python39Packages.graph_nets
  • ...
13 packages skipped due to time constraints:
  • python38Packages.baselines
  • python38Packages.edward
  • python38Packages.mask-rcnn
  • python38Packages.scikit-tda
  • python38Packages.tensorflow (python38Packages.tensorflow-build ,python38Packages.tensorflow-build_2 ,python38Packages.tensorflowWithoutCuda ,python38Packages.tensorflow_2)
  • python38Packages.tflearn
  • python38Packages.umap-learn
  • python39Packages.baselines
  • python39Packages.edward
  • python39Packages.mask-rcnn
  • ...
2 packages built successfully:
  • boringssl
  • nginxQuic
2 suggestions:
  • warning: missing-phase-hooks

    buildPhase should probably contain runHook preBuild.

    Near pkgs/development/go-modules/generic/default.nix:145:5:

        |
145 |     buildPhase = args.buildPhase or ''
    |     ^
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/development/go-modules/generic/default.nix:220:5:

        |
220 |     installPhase = args.installPhase or ''
    |     ^

mkg20001 and others added 3 commits April 18, 2021 20:20
@mkg20001 @SuperSandro2000
boringssl: 2019-12-04 -> 2021-04-18
1183815 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@mkg20001
nginxQuic: init
4a3bb18
@mkg20001 @SuperSandro2000
nginx: add vhost.http3
9530794 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@mkg20001 mkg20001 merged commit 9f566fc into NixOS:master Apr 19, 2021
@mkg20001 mkg20001 deleted the http3 branch April 19, 2021 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mkg20001 @r-rmcgibbo @SuperSandro2000