Merge pull request #82319 from aanderse/tomcat-update
tomcat: 7.0.92 -> 7.0.100, 8.5.42 -> 8.5.51, 9.0.21 -> 9.0.31
This commit is contained in:
commit
6283b00f4f
@ -32,25 +32,19 @@ let
|
||||
in {
|
||||
tomcat7 = common {
|
||||
versionMajor = "7";
|
||||
versionMinor = "0.92";
|
||||
sha256 = "0j015mf15drl92kvgyi1ppzjziw0k1rwvfnih8r20h92ylk8mznk";
|
||||
versionMinor = "0.100";
|
||||
sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v";
|
||||
};
|
||||
|
||||
tomcat8 = common {
|
||||
versionMajor = "8";
|
||||
versionMinor = "0.53";
|
||||
sha256 = "1ymp5n6xjqzpqjjlwql195v8r5fsmry7nfax46bafkjw8b24g80r";
|
||||
};
|
||||
|
||||
tomcat85 = common {
|
||||
versionMajor = "8";
|
||||
versionMinor = "5.42";
|
||||
sha256 = "1d90abwwvl0ghr0g0drk48j37wr2zgw74vws9z2rshyzrwgbvgp3";
|
||||
versionMinor = "5.51";
|
||||
sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3";
|
||||
};
|
||||
|
||||
tomcat9 = common {
|
||||
versionMajor = "9";
|
||||
versionMinor = "0.21";
|
||||
sha256 = "0nsylbqvky4pf3wpsx3a29b85lvwk91ay37mljk9636qffjj1vjh";
|
||||
versionMinor = "0.31";
|
||||
sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v";
|
||||
};
|
||||
}
|
||||
|
@ -488,6 +488,7 @@ mapAliases ({
|
||||
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
|
||||
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
|
||||
tftp_hpa = tftp-hpa; # added 2015-04-03
|
||||
tomcat85 = tomcat8; # added 2020-03-11
|
||||
torbrowser = tor-browser-bundle-bin; # added 2017-04-05
|
||||
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
|
||||
trang = jing-trang; # added 2018-04-25
|
||||
|
@ -16021,7 +16021,6 @@ in
|
||||
inherit (callPackages ../servers/http/tomcat { })
|
||||
tomcat7
|
||||
tomcat8
|
||||
tomcat85
|
||||
tomcat9;
|
||||
|
||||
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
|
||||
|
Loading…
x
Reference in New Issue
Block a user