tomcat{9,10}: add passthru.tests.version

+7 -3
+7 -3
pkgs/servers/http/tomcat/default.nix
··· 1 - { stdenv, lib, fetchurl, nixosTests }: 2 3 let 4 5 - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { 6 pname = "apache-tomcat"; 7 version = "${versionMajor}.${versionMinor}"; 8 9 src = fetchurl { 10 - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; 11 inherit sha256; 12 }; 13 ··· 22 23 passthru.tests = { 24 inherit (nixosTests) tomcat; 25 }; 26 27 meta = with lib; {
··· 1 + { stdenv, lib, fetchurl, nixosTests, testers, jre }: 2 3 let 4 5 + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: { 6 pname = "apache-tomcat"; 7 version = "${versionMajor}.${versionMinor}"; 8 9 src = fetchurl { 10 + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; 11 inherit sha256; 12 }; 13 ··· 22 23 passthru.tests = { 24 inherit (nixosTests) tomcat; 25 + version = testers.testVersion { 26 + package = finalAttrs.finalPackage; 27 + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; 28 + }; 29 }; 30 31 meta = with lib; {