1 files changed, 12 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix
index 78e108d8c8da..506b692e68af 100644
--- a/nixpkgs/pkgs/servers/http/tomcat/default.nix
+++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix
@@ -20,31 +20,25 @@ 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 ];
     };
   });
 
 in {
-  tomcat7 = common {
-    versionMajor = "7";
-    versionMinor = "0.100";
-    sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v";
-  };
-
-  tomcat8 = common {
-    versionMajor = "8";
-    versionMinor = "5.51";
-    sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3";
-  };
-
   tomcat9 = common {
     versionMajor = "9";
-    versionMinor = "0.31";
-    sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v";
+    versionMinor = "0.46";
+    sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h";
+  };
+
+  tomcat10 = common {
+    versionMajor = "10";
+    versionMinor = "0.6";
+    sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n";
   };
 }