diff options
| author | Anthony Roussel <anthony@roussel.dev> | 2023-10-26 12:09:11 +0200 |
|---|---|---|
| committer | Anthony Roussel <anthony@roussel.dev> | 2023-11-07 11:35:45 +0100 |
| commit | a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad (patch) | |
| tree | bae37b89e16806dd8dd9a0bed62d74dfc193d3ae /pkgs/servers/http | |
| parent | 0031faaecafd2344c531edde932afc67508640f0 (diff) | |
| download | nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar.gz nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar.bz2 nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar.lz nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar.xz nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.tar.zst nixlib-a4f37c8896be3003cd0f0882a46a8ba1fc81c5ad.zip | |
tomcat{9,10}: add passthru.tests.version
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 9872cf9e8e0f..af735eebd348 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, nixosTests }: +{ stdenv, lib, fetchurl, nixosTests, testers, jre }: let - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; inherit sha256; }; @@ -22,6 +22,10 @@ let passthru.tests = { inherit (nixosTests) tomcat; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; + }; }; meta = with lib; { |