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: e42c07d78a1f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 190ec72c7126
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 11, 2018

  1. Merge branch 'release-18.03' into staging-18.03

    @vcunat
    vcunat committed Aug 11, 2018
    Copy the full SHA
    e2630a8 View commit details

  2. libtiff: update url to patch file (#44815) 

    (cherry picked from commit 527d3d5)
Additionally fixes CVE-2018-8905 and CVE-2018-10963.
    @Izorkin @vcunat
    Izorkin authored and vcunat committed Aug 11, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    99907ae View commit details

  3. Merge branch 'staging-18.03' into release-18.03 libtiff security patches

    @vcunat
    vcunat committed Aug 11, 2018
    Copy the full SHA
    190ec72 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/libtiff/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libtiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

prePatch = let
debian = fetchurl {
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-5.debian.tar.xz;
sha256 = "15lwcsd46gini27akms2ngyxnwi1hs2yskrv5x2wazs5fw5ii62w";
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
};
in ''
tar xf ${debian}