From 921a58b8bc1ba93978ec66882d133eede4ac547f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 8 Dec 2021 16:51:59 +0300 Subject: [PATCH 1/2] nginxQuic: 6d1488b62dc5 -> 0ee56d2eac44 --- pkgs/servers/http/nginx/quic.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 5874d3dd6794..3217b859bc82 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "6d1488b62dc5"; # branch=quic - sha256 = "18xrkzzi4cxl4zi7clikwww9ad9l7vilrfs67hhzx7898jkws5fi"; + rev = "0ee56d2eac44"; # branch=quic + sha256 = "sha256-ErJa71aOzcjcBl1P9+g5kzs5sr0JdjrPwYKZ9VAvQus="; }; preConfigure = '' @@ -16,9 +16,8 @@ callPackage ./generic.nix args { configureFlags = [ "--with-http_v3_module" - "--with-http_quic_module" "--with-stream_quic_module" ]; - version = "quic"; + version = "1.21.4-quic"; } From 0f67b51e359395b54e0f4d61c4d368838b39dbeb Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 8 Dec 2021 16:54:52 +0300 Subject: [PATCH 2/2] nginxQuic: use quictls library --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4d0a399f763..604b379eceaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21048,7 +21048,7 @@ with pkgs; # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; # Use latest boringssl to allow http3 support - openssl = boringssl; + openssl = quictls; }; nginxStable = callPackage ../servers/http/nginx/stable.nix {