From dff56212fe3c2cb1bf5b728a60ec31663f87e82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 22 May 2025 01:29:44 +0200
Subject: [PATCH] nginx: always use newer nginx version between stable and
 mainline

---
 modules/nginx.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/nginx.nix b/modules/nginx.nix
index 86be1e4..0bd8b30 100644
--- a/modules/nginx.nix
+++ b/modules/nginx.nix
@@ -170,7 +170,11 @@ in
           if cfg.configureQuic then
             pkgs.nginxQuic
           else
-            pkgs.nginxMainline
+            # use the newer version
+            if lib.versionOlder pkgs.nginx.version pkgs.nginxMainline.version then
+              pkgs.nginxMainline
+            else
+              pkgs.nginx
         ));
 
         recommendedBrotliSettings = lib.mkIf cfg.allRecommendOptions (lib.mkDefault true);