nginx: fix test and update script passthru

Otherwise all nginx forks gain all of nginx' tests.
This commit is contained in:
Martin Weinelt 2026-06-28 02:40:44 +02:00
commit e9f301fcf7
No known key found for this signature in database
GPG key ID: 87C1E9888F856759

View file

@ -46,9 +46,7 @@ outer@{
postInstall ? "",
meta ? null,
nginx-doc ? outer.nginx-doc,
passthru ? {
tests = { };
},
passthru ? { },
}:
let
@ -281,25 +279,28 @@ stdenv.mkDerivation {
passthru = {
inherit modules;
tests = {
inherit (nixosTests)
nginx
nginx-auth
nginx-etag
nginx-etag-compression
nginx-globalredirect
nginx-http3
nginx-proxyprotocol
nginx-pubhtml
nginx-sso
nginx-status-page
nginx-unix-socket
;
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
acme-integration = nixosTests.acme.nginx;
acme-integration-without-reload = nixosTests.acme.nginx-without-reload;
}
// passthru.tests;
tests =
passthru.tests or {
inherit (nixosTests)
nginx
nginx-auth
nginx-etag
nginx-etag-compression
nginx-globalredirect
nginx-http3
nginx-proxyprotocol
nginx-pubhtml
nginx-sso
nginx-status-page
nginx-unix-socket
;
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
acme-integration = nixosTests.acme.nginx;
acme-integration-without-reload = nixosTests.acme.nginx-without-reload;
};
}
// lib.optionalAttrs (passthru ? updateScript) {
inherit (passthru) updateScript;
};
meta =