diff options
author | Graham Christensen <graham@grahamc.com> | 2017-02-17 22:24:33 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2017-02-17 22:24:33 -0500 |
commit | 6fc38401a28e4638bd840743ae29a2806b68936d (patch) | |
tree | 39fc77f3d3d663a1d7e30e9bb47b7ab12ac013b0 /pkgs/servers/http | |
parent | f308722a0002c83a1ab8a2b7bfd7aac312761e01 (diff) | |
download | nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar.gz nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar.bz2 nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar.lz nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar.xz nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.tar.zst nixlib-6fc38401a28e4638bd840743ae29a2806b68936d.zip |
tomcat6: drop, no longer supported.
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 7 | ||||
-rw-r--r-- | 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 909b26f162b0..ac507794a91e 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 3562ea1e129d..d070a9f17404 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 = { |