Unverified Commit a4f37c88 authored by Anthony Roussel's avatar Anthony Roussel
Browse files

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

parent 0031faae

pkgs/servers/http/tomcat/default.nix

+7 −3
Original line number Diff line number Diff line 
{ 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; {