From 1c32875fb3e158ecaa735963b3d6fb8ff4c48011 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:45:58 +0100 Subject: [PATCH 1/7] tomcat9: 9.0.82 -> 9.0.83 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 0b1d4115c895..81b6ddae2e51 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -41,8 +41,8 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.82"; - sha256 = "sha256-xvRGXDUkYaHFYacUPg81Xf0xyTbdsc1XP/PmqMR8bQc="; + versionMinor = "0.83"; + sha256 = "sha256-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; }; tomcat10 = common { From 36e481f7c83041083ad405179931109bb409217e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:46:17 +0100 Subject: [PATCH 2/7] tomcat10: 10.1.15 -> 10.1.16 https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.16_(schultz) --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 81b6ddae2e51..02353eb55a65 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -47,7 +47,7 @@ in { tomcat10 = common { versionMajor = "10"; - versionMinor = "1.15"; - sha256 = "sha256-cqQW3Dc3sC/1zoidMIGDBNw4G5bnxYvhmHz7U7K6Djg="; + versionMinor = "1.16"; + sha256 = "sha256-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; }; } From e24c29c9cc13f0df11ba3d924aa99750800bcde6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:47:03 +0100 Subject: [PATCH 3/7] tomcat9,tomcat10: rename sha256 to hash --- pkgs/servers/http/tomcat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 02353eb55a65..e6e8bf440318 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -2,13 +2,13 @@ let - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: { + common = { versionMajor, versionMinor, hash }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "webapps" ]; @@ -42,12 +42,12 @@ in { tomcat9 = common { versionMajor = "9"; versionMinor = "0.83"; - sha256 = "sha256-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; + hash = "hash-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; }; tomcat10 = common { versionMajor = "10"; versionMinor = "1.16"; - sha256 = "sha256-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; + hash = "hash-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; }; } From d525015c8e8649fa0cddf9249c99a27b041b6b66 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:53:17 +0100 Subject: [PATCH 4/7] tomcat: refactor --- pkgs/servers/http/tomcat/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index e6e8bf440318..996e0d03f77a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl, nixosTests, testers, jre }: let - - common = { versionMajor, versionMinor, hash }: stdenv.mkDerivation (finalAttrs: { + common = { version, hash }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; - version = "${versionMajor}.${versionMinor}"; + inherit version; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${lib.versions.major version}/v${version}/bin/apache-tomcat-${version}.tar.gz"; inherit hash; }; @@ -40,14 +39,12 @@ let in { tomcat9 = common { - versionMajor = "9"; - versionMinor = "0.83"; - hash = "hash-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; + version = "9.0.83"; + hash = "sha256-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; }; tomcat10 = common { - versionMajor = "10"; - versionMinor = "1.16"; - hash = "hash-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; + version = "10.1.16"; + hash = "sha256-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; }; } From c9aee562c14c6e428c95ffe08ae4f15004dfa4c6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:54:26 +0100 Subject: [PATCH 5/7] tomcat: sync meta.platforms with jre --- pkgs/servers/http/tomcat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 996e0d03f77a..3ff672692e7b 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,7 +30,7 @@ let meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; - platforms = platforms.all; + platforms = jre.meta.platforms; maintainers = with maintainers; [ anthonyroussel ]; license = [ licenses.asl20 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; From 9a5f5ee7d3bae6c42b95c5b0f5d2a1bb5243a5d5 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:56:09 +0100 Subject: [PATCH 6/7] nixos/tomcat: add anthonyroussel to maintainers --- nixos/modules/services/web-servers/tomcat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 30d6b99fcfda..8430265eabce 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -8,7 +8,7 @@ in { meta = { - maintainers = with lib.maintainers; [ danbst ]; + maintainers = with lib.maintainers; [ danbst anthonyroussel ]; }; ###### interface From b3c4d8ae8af158ddc33c0a8131a113dbb2056b96 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 29 Nov 2023 07:56:25 +0100 Subject: [PATCH 7/7] nixosTests.tomcat: add anthonyroussel to maintainers --- nixos/tests/tomcat.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index a5f219e104ad..ff58ca8ac618 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,5 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "tomcat"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; nodes.machine = { pkgs, ... }: { services.tomcat = {