Skip to content

Commit ec11635

Browse files
Merge pull request #255 from NuschtOS/nginx-newer
nginx: always use newer nginx version between stable and mainline
2 parents 758f154 + dff5621 commit ec11635

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

modules/nginx.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,11 @@ in
170170
if cfg.configureQuic then
171171
pkgs.nginxQuic
172172
else
173-
pkgs.nginxMainline
173+
# use the newer version
174+
if lib.versionOlder pkgs.nginx.version pkgs.nginxMainline.version then
175+
pkgs.nginxMainline
176+
else
177+
pkgs.nginx
174178
));
175179

176180
recommendedBrotliSettings = lib.mkIf cfg.allRecommendOptions (lib.mkDefault true);

0 commit comments

Comments
 (0)