From 91ecb7d7ff07358874873e0cd7f8ef1f77157e61 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 23 May 2023 18:27:58 +0200
Subject: [PATCH 1/2] nginxMainline: 1.24.0 -> 1.25.0

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index e43eb0d7b593..fe454d25d122 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.24.0";
-  hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=";
+  version = "1.25.0";
+  hash = "sha256-XtRNRZQycqTopbz0Q0I3IQ8t4xuQP8peOBwbvX7uHow=";
 }

From 27d53b81ccf85de20656408fbda5181ce0795867 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 23 May 2023 18:37:54 +0200
Subject: [PATCH 2/2] 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";
 }