Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5431160b71d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c7edaaed5a6
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2018

  1. tomcat85: 8.5.20 -> 8.5.23 (fixes CVE-2017-12617) 

    For details see [1].

[1] http://tomcat.apache.org/security-8.html#Fixed_in_Apache_Tomcat_8.5.23

(cherry picked from commit 1559070)
    @andir @globin
    andir authored and globin committed Jan 9, 2018
    Copy the full SHA
    165795d View commit details

  2. tomcat8: 8.0.46 -> 8.0.47 (fixes CVE-2017-12617) 

    For details see [1].

[1] http://tomcat.apache.org/security-8.html#Fixed_in_Apache_Tomcat_8.0.47

(cherry picked from commit d065224)
    @andir @globin
    andir authored and globin committed Jan 9, 2018
    Copy the full SHA
    646a7cf View commit details

  3. tomcat7: 7.0.81 -> 7.0.82 (fixes CVE-2017-12617) 

    For details see [1].

[1] http://tomcat.apache.org/security-7.html#Fixed_in_Apache_Tomcat_7.0.82

(cherry picked from commit 3498654)
    @andir @globin
    andir authored and globin committed Jan 9, 2018
    Copy the full SHA
    5d6541e View commit details

  4. tomcat9: 9.0.0.M17 -> 9.0.2 

    (cherry picked from commit 637d5dd)
    @globin
    globin committed Jan 9, 2018
    Copy the full SHA
    5c7edaa View commit details
Showing with 8 additions and 8 deletions.
  1. +8 −8 pkgs/servers/http/tomcat/default.nix
16 changes: 8 additions & 8 deletions pkgs/servers/http/tomcat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,25 +32,25 @@ let
in {
tomcat7 = common {
versionMajor = "7";
versionMinor = "0.81";
sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq";
versionMinor = "0.82";
sha256 = "0vb7c5i50ral4rr39ss95k7cxnzd7fs21zd7f97d1f3qslzwl69g";
};

tomcat8 = common {
versionMajor = "8";
versionMinor = "0.46";
sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk";
versionMinor = "0.47";
sha256 = "0xv4v3i08rwzfmz7rkhglq5cbjgnfava8dw0i33vsp7dk162a4g4";
};

tomcat85 = common {
versionMajor = "8";
versionMinor = "5.20";
sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a";
versionMinor = "5.23";
sha256 = "1qnww70x75c0qf2wn8mkpz5lszggjnh78dpb4chyw2fnbm3wxain";
};

tomcatUnstable = common {
versionMajor = "9";
versionMinor = "0.0.M17";
sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg";
versionMinor = "0.2";
sha256 = "0aaykzi0b2xsdmjp60ihcjzh1m95p0a79kn5l2v7vgbkyg449638";
};
}