From 120dfe62173840ed564f2d95d70dcce384d70194 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 21:52:26 -0400 Subject: [PATCH 1/6] tomcat9: 9.0.31 -> 9.0.46 --- 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 78e108d8c8da..5b695c9e2090 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -44,7 +44,7 @@ in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.31"; - sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v"; + versionMinor = "0.46"; + sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h"; }; } From 40ab59df3960bdf21e8d455fbc4f4a1a1510c4c1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 21:55:00 -0400 Subject: [PATCH 2/6] tomcat-native: 1.2.28 -> 1.2.30 --- pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index c9c4453cf5f7..dfcbe5d0f18b 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.28"; + version = "1.2.30"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb"; + sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953"; }; sourceRoot = "${pname}-${version}-src/native"; From d2080550e3b4c2fd492576e558b0f81022ffe436 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 22:04:58 -0400 Subject: [PATCH 3/6] tomcat10: init at 10.0.6 --- pkgs/servers/http/tomcat/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 5b695c9e2090..5e0fe279b8ef 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -47,4 +47,10 @@ in { versionMinor = "0.46"; sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h"; }; + + tomcat10 = common { + versionMajor = "10"; + versionMinor = "0.6"; + sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cb0404e139e..c51b7caaccf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20014,7 +20014,8 @@ in inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 - tomcat9; + tomcat9 + tomcat10; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; From b6ce336775238977d4f8f050efc9b4f97d912128 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 21:58:10 -0400 Subject: [PATCH 4/6] tomcat7: drop package --- pkgs/servers/http/tomcat/default.nix | 6 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 5e0fe279b8ef..7684b9ef41fd 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,12 +30,6 @@ let }); in { - tomcat7 = common { - versionMajor = "7"; - versionMinor = "0.100"; - sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v"; - }; - tomcat8 = common { versionMajor = "8"; versionMinor = "5.51"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eedf4fc75efc..7704bb953984 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -834,6 +834,7 @@ mapAliases ({ tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 timescale-prometheus = promscale; # added 2020-09-29 + tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 tomcat85 = tomcat8; # added 2020-03-11 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c51b7caaccf3..b82b89211dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20012,7 +20012,6 @@ in trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { }) - tomcat7 tomcat8 tomcat9 tomcat10; From fa60c16dfce4d57edd04e5a1ba8d8cb05575723d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 22:07:10 -0400 Subject: [PATCH 5/6] tomcat8: drop package --- pkgs/servers/http/tomcat/default.nix | 6 ------ pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 7684b9ef41fd..6994f1bc6f9b 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,12 +30,6 @@ let }); in { - tomcat8 = common { - versionMajor = "8"; - versionMinor = "5.51"; - sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3"; - }; - tomcat9 = common { versionMajor = "9"; versionMinor = "0.46"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7704bb953984..484fb298f438 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -835,7 +835,8 @@ mapAliases ({ tftp_hpa = tftp-hpa; # added 2015-04-03 timescale-prometheus = promscale; # added 2020-09-29 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 - tomcat85 = tomcat8; # added 2020-03-11 + tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 + tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b82b89211dff..13a40f747f73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20012,7 +20012,6 @@ in trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { }) - tomcat8 tomcat9 tomcat10; From c802ded7fcc0559da97b68d033fdc083fffc57cb Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 22:01:43 -0400 Subject: [PATCH 6/6] tomcat9: remove danbst as maintainer --- 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 6994f1bc6f9b..506b692e68af 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -20,12 +20,12 @@ let mv $out/webapps $webapps/ ''; - meta = { + meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; - platforms = with lib.platforms; all; - maintainers = with lib.maintainers; [ danbst ]; - license = [ lib.licenses.asl20 ]; + platforms = platforms.all; + maintainers = [ ]; + license = [ licenses.asl20 ]; }; });