mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
nginx: fix test and update script passthru
Otherwise all nginx forks gain all of nginx' tests.
This commit is contained in:
parent
05f57a7e9c
commit
e9f301fcf7
1 changed files with 23 additions and 22 deletions
|
|
@ -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 =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue