Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 08d245eb31a3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f2ddbba1d85f
Choose a head ref
  • 5 commits
  • 7 files changed
  • 4 contributors

Commits on Jun 10, 2018

  1. tomcat service: fix webapps default option (#40657) 

    The old package tomcat.webapps does not exist

(cherry picked from commit 1daa771)
    @fadenb @xeji
    fadenb authored and xeji committed Jun 10, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3939055 View commit details

  2. gnupg: 2.2.6 -> 2.2.8 

    This addresses CVE-2018-12020. The details can be retrived from the
changelog [1].

[1] https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html

(cherry picked from commit 1abc053)
    @andir
    andir committed Jun 10, 2018
    Copy the full SHA
    02c42d0 View commit details

  3. libtiff: 4.0.9 update ptches 

    Get libtiff on the same patch level as Debian. The imported patch file contains:

CVE-2017-9935
CVE-2017-11613
CVE-2017-17095
CVE-2017-18013
CVE-2018-5784
CVE-2018-7456

Re #41748 (master)
Re #41749 (release-18.03 - needs to be cherry-picked)

(cherry picked from commit cca45cc)
    @xeji
    Christian Kauhaus authored and xeji committed Jun 10, 2018
    Copy the full SHA
    0338ce0 View commit details

  4. Merge pull request #41809 from andir/18.03/gnupg-2.2.8 

    [18.03] gnupg: 2.2.6 -> 2.2.8
    @andir
    andir authored Jun 10, 2018
    Copy the full SHA
    b7c661c View commit details

Commits on Jun 11, 2018

  1. linux-copperhead: LTS based on regular 4.14 

    (cherry picked from commit f58999f88fe1e6a83dbc2c4a360179a9201802cd)
    @NeQuissimus
    NeQuissimus committed Jun 11, 2018
    Copy the full SHA
    f2ddbba View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/web-servers/tomcat.nix
View file
Original file line number Diff line number Diff line change
@@ -78,8 +78,8 @@ in

webapps = mkOption {
type = types.listOf types.package;
default = [ tomcat.webapps ];
defaultText = "[ tomcat.webapps ]";
default = [ tomcat85.webapps ];
defaultText = "[ tomcat85.webapps ]";
description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
};

8 changes: 4 additions & 4 deletions pkgs/development/libraries/libtiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {

prePatch = let
debian = fetchurl {
url = http://snapshot.debian.org/archive/debian-debug/20180128T155203Z//pool/main/t/tiff/tiff_4.0.9-3.debian.tar.xz;
sha256 = "0wya42y7kcq093g3h7ca10cm5sns1mgnkjmdd2qdi59v8arga4y4";
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-5.debian.tar.xz;
sha256 = "15lwcsd46gini27akms2ngyxnwi1hs2yskrv5x2wazs5fw5ii62w";
};
in ''
tar xf '${debian}'
patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
tar xf ${debian}
patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
'';

outputs = [ "bin" "dev" "out" "man" "doc" ];
Loading