From 6fc38401a28e4638bd840743ae29a2806b68936d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:24:33 -0500 Subject: [PATCH] tomcat6: drop, no longer supported. --- pkgs/servers/http/tomcat/default.nix | 7 ------- pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 909b26f162b..ac507794a91 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,13 +30,6 @@ let }); in { - - tomcat6 = common { - versionMajor = "6"; - versionMinor = "0.48"; - sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; - }; - tomcat7 = common { versionMajor = "7"; versionMinor = "0.73"; diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 3562ea1e129..d070a9f1740 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,10 +1,10 @@ -{ stdenv, tomcat6, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "tomcat-mysql-jdbc"; builder = ./builder.sh; buildInputs = [ mysql_jdbc ]; - + inherit mysql_jdbc; meta = {