nixos: Bump nginx for NGINX2Root fixes
Override `nginxStable` and `nginxMainline` to 1.30.7 and 1.31.9 until the pinned channels ship them. OpenResty has no fixed release yet, so disable HTTP/2 on `spoder`'s vhosts in the meantime. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -167,7 +167,8 @@ in
|
|||||||
onlySSL = mkDefault true;
|
onlySSL = mkDefault true;
|
||||||
useACMEHost = mkDefault domain;
|
useACMEHost = mkDefault domain;
|
||||||
kTLS = mkDefault true;
|
kTLS = mkDefault true;
|
||||||
http2 = mkDefault true;
|
# TODO: Re-enable once OpenResty ships the NGINX2Root HTTP/2 fixes.
|
||||||
|
http2 = mkDefault false;
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
mkMerge [
|
mkMerge [
|
||||||
|
|||||||
@@ -91,6 +91,24 @@ in
|
|||||||
preBuild = (old.preBuild or "") + "\nnpm run postinstall\n";
|
preBuild = (old.preBuild or "") + "\nnpm run postinstall\n";
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
(final: prev:
|
||||||
|
let
|
||||||
|
# Bump nginx to a release with the NGINX2Root fixes until every pin ships one.
|
||||||
|
# TODO: Drop once all channels are past these versions.
|
||||||
|
bump = pkg: version: hash:
|
||||||
|
if prev.lib.versionOlder pkg.version version then
|
||||||
|
pkg.overrideAttrs {
|
||||||
|
inherit version;
|
||||||
|
src = final.fetchurl {
|
||||||
|
url = "https://nginx.org/download/nginx-${version}.tar.gz";
|
||||||
|
inherit hash;
|
||||||
|
};
|
||||||
|
} else pkg;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
nginxStable = bump prev.nginxStable "1.30.7" "sha256-JWW1yDcFDpWPcPsPc8SOK8pFQq00n9NW9G+wxyYQvG4=";
|
||||||
|
nginxMainline = bump prev.nginxMainline "1.31.9" "sha256-oRxe7uLiV/RHjw5kn4SwBAeH0nfS0+UjOVKqa23LgK0=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user