Merge pull request #233646 from helsinki-systems/upd/nginx

NixOS · May 23, 2023 · e6e049b · e6e049b
2 parents da2d713 + 27d53b8
commit e6e049b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git 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=";
 }
diff --git 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";
 }