diff options
author | Aaron Andersen <aaron@fosslib.net> | 2020-03-16 15:46:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-16 15:46:48 -0400 |
commit | 6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96 (patch) | |
tree | 131cfe8923004eaa98a4e176b1e8be6d08331bca | |
parent | d467d6ce4a608ae881aa5f35cd41a6af8e9d5188 (diff) | |
parent | 46e7580f247341130432bf710b43e938b01db0c8 (diff) | |
download | nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar.gz nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar.bz2 nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar.lz nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar.xz nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.tar.zst nixlib-6283b00f4f5bcc9e40c6e5bce7816f8811c9ef96.zip |
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
-rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 38b4974e1554..3908db5ea71c 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -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"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2f29f9cc0173..af8cbed10613 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e45856b05d7..a50780e8183f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16021,7 +16021,6 @@ in inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 - tomcat85 tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; |