From 27d53b81ccf85de20656408fbda5181ce0795867 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 23 May 2023 18:37:54 +0200 Subject: [PATCH] nginxQuic: share src and version with nginxMainline quic support was merged still a separate package, because it uses quictls and sets configureFlags --- pkgs/servers/http/nginx/quic.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 7248ad1c4c0b..ea5af571f110 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -1,25 +1,14 @@ { callPackage -, fetchhg +, nginxMainline , ... } @ args: callPackage ./generic.nix args { pname = "nginxQuic"; - src = fetchhg { - url = "https://hg.nginx.org/nginx-quic"; - rev = "0af598651e33"; # branch=quic - hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA="; - }; - - preConfigure = '' - ln -s auto/configure configure - ''; + inherit (nginxMainline) src version; configureFlags = [ "--with-http_v3_module" - "--with-stream_quic_module" ]; - - version = "1.23.4"; }