From fa60c16dfce4d57edd04e5a1ba8d8cb05575723d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 22:07:10 -0400 Subject: [PATCH] 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 7684b9ef41f..6994f1bc6f9 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 7704bb95398..484fb298f43 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 b82b89211df..13a40f747f7 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;