about summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-12-31 12:00:36 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-12-31 12:00:36 +0100
commit070290bda7972072a531c7e79a29bd005ebb84df (patch)
tree572922a35ba554a97ff4771875f3a265fb8ce0e1 /pkgs/servers/http
parentec1f78d1cb6ac86743ffb797bf88d4633b91e733 (diff)
parent42575040fc64c1f5560c1cd1d1fdf0fd5e5d4b49 (diff)
downloadnixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.gz
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.bz2
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.lz
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.xz
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.zst
nixlib-070290bda7972072a531c7e79a29bd005ebb84df.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/tomcat/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 8fe34cd6183d..40d865e2f56c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -32,25 +32,25 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.82";
-    sha256 = "0vb7c5i50ral4rr39ss95k7cxnzd7fs21zd7f97d1f3qslzwl69g";
+    versionMinor = "0.92";
+    sha256 = "0j015mf15drl92kvgyi1ppzjziw0k1rwvfnih8r20h92ylk8mznk";
   };
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.47";
-    sha256 = "0xv4v3i08rwzfmz7rkhglq5cbjgnfava8dw0i33vsp7dk162a4g4";
+    versionMinor = "0.53";
+    sha256 = "1ymp5n6xjqzpqjjlwql195v8r5fsmry7nfax46bafkjw8b24g80r";
   };
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.23";
-    sha256 = "1qnww70x75c0qf2wn8mkpz5lszggjnh78dpb4chyw2fnbm3wxain";
+    versionMinor = "5.35";
+    sha256 = "0n6agr2wn8m5mv0asz73hy2194n9rk7mh5wsp2pz7aq0andbhh5s";
   };
 
   tomcat9 = common {
     versionMajor = "9";
-    versionMinor = "0.2";
-    sha256 = "0aaykzi0b2xsdmjp60ihcjzh1m95p0a79kn5l2v7vgbkyg449638";
+    versionMinor = "0.13";
+    sha256 = "1rsrnmkkrbzrj56jk2wh8hrr79kfkk3fz1j0abk3midn1jnbgxxq";
   };
 }