diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-19 09:39:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-19 09:39:19 -0500 |
commit | d3deaacfb475a62ceba63f34672280029ad6c738 (patch) | |
tree | 17ef9b2b0551e68200e764d3f3c24ade9dc0e046 /pkgs/servers/http | |
parent | d69346e062eb5f1e4e9b0871f189431fe5a8c957 (diff) | |
parent | e5ae8202f71730f7f1a14f783af924355194724c (diff) |
Merge pull request #263550 from anthonyroussel/updates/axis2
axis2: 1.7.9 -> 1.8.2, tomcat10: 10.0.27 -> 10.1.15, tomcat9: 9.0.75 -> 9.0.82
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 24 |
2 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 4bca9a37a9ce2..5cee9020b8aa9 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "axis2"; - version = "1.7.9"; + version = "1.8.2"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; - sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; + url = "mirror://apache/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; + hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; }; nativeBuildInputs = [ unzip ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + homepage = "https://axis.apache.org/axis2/java/core/"; + changelog = "https://axis.apache.org/axis2/java/core/release-notes/${version}.html"; + maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index ede01d350d4b1..0b1d4115c895a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl }: +{ 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; }; @@ -20,11 +20,19 @@ let mv $out/webapps $webapps/ ''; + passthru.tests = { + inherit (nixosTests) tomcat; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; + }; + }; + meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ anthonyroussel ]; license = [ licenses.asl20 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; @@ -33,13 +41,13 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.75"; - sha256 = "sha256-VWfKg789z+ns1g3hDsCZFYQ+PsdqUEBeBHCihkGZelk="; + versionMinor = "0.82"; + sha256 = "sha256-xvRGXDUkYaHFYacUPg81Xf0xyTbdsc1XP/PmqMR8bQc="; }; tomcat10 = common { versionMajor = "10"; - versionMinor = "0.27"; - sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc="; + versionMinor = "1.15"; + sha256 = "sha256-cqQW3Dc3sC/1zoidMIGDBNw4G5bnxYvhmHz7U7K6Djg="; }; } |