diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 18:01:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 18:01:53 +0000 |
| commit | f4afba201428530fdb713fda18d055bd99daf333 (patch) | |
| tree | a760cddec5bad37433f29f2c1c2c75b6fba8d05d /pkgs/servers/http | |
| parent | b52540749224057bb31cfb20168fe71474cf2116 (diff) | |
| parent | a01279cf2329f710bb84f3aa64d32ea87a8c4124 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/tomcat-native.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 1f175c03d8a85..8f90adab101b1 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation { passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page nginx-unix-socket; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 5f9ea8a1665d5..bd05943ac71f9 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - hash = "sha256-lY0fEhZRwQxhVW133J0NQfO1OYiiGVRC3krG9MuHg4g="; + hash = "sha256-vmF8V26SO2B50LdSBtcG2ifdBDzr9Qv7leOpwKodGjU="; }; sourceRoot = "${pname}-${version}-src/native"; |