diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-01-08 18:14:20 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-01-09 01:31:06 +0100 |
| commit | 637d5dd00cb2a2a556f4175ae21423351dc6e0c1 (patch) | |
| tree | f2768298d86c5f94292075a125d0302abe34b35f | |
| parent | 3498654f27ebd452b8ab451c9f1e241400e44551 (diff) | |
| download | nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar.gz nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar.bz2 nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar.lz nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar.xz nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.tar.zst nixpkgs-637d5dd00cb2a2a556f4175ae21423351dc6e0c1.zip | |
tomcat9: 9.0.0.M17 -> 9.0.2
also renamed from tomcatUnstable to tomcat9
| -rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 943415e08c6..0b2e5c0b69d 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -29,7 +29,7 @@ in type = types.package; default = pkgs.tomcat85; defaultText = "pkgs.tomcat85"; - example = lib.literalExample "pkgs.tomcatUnstable"; + example = lib.literalExample "pkgs.tomcat9"; description = '' Which tomcat package to use. ''; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 9fc0f99739b..098825d59ce 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -48,9 +48,9 @@ in { sha256 = "1qnww70x75c0qf2wn8mkpz5lszggjnh78dpb4chyw2fnbm3wxain"; }; - tomcatUnstable = common { + tomcat9 = common { versionMajor = "9"; - versionMinor = "0.0.M17"; - sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg"; + versionMinor = "0.2"; + sha256 = "0aaykzi0b2xsdmjp60ihcjzh1m95p0a79kn5l2v7vgbkyg449638"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a6a8dfb1bc..f58fb68dbd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12295,7 +12295,7 @@ with pkgs; tomcat7 tomcat8 tomcat85 - tomcatUnstable; + tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; |