diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 5e0fe279b8e..7684b9ef41f 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 eedf4fc75ef..7704bb95398 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 c51b7caaccf..b82b89211df 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;