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: 92e700d29718
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: 6ea49f6f8630
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 28, 2018

  1. libtiff: 4.0.9 -> 2018-11-04 

    This includes a bunch of security fixes (#49786), and mimics what Debian
has done in moving to a git snapshot instead of a released version +
backported security patches.

(cherry picked from commit 3137c60)
    @andrew-d @Ekleog
    andrew-d authored and Ekleog committed Nov 28, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    76fc36f View commit details

  2. libtiff: 2018-11-04 -> 4.0.10 

    (cherry picked from commit ac3b358)
    @andrew-d @Ekleog
    andrew-d authored and Ekleog committed Nov 28, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    6ea49f6 View commit details
Showing with 11 additions and 17 deletions.
  1. +11 −17 pkgs/development/libraries/libtiff/default.nix
28 changes: 11 additions & 17 deletions pkgs/development/libraries/libtiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
{ stdenv
, fetchurl

, pkgconfig

, zlib
, libjpeg
, xz
}:

let
version = "4.0.9";
in
stdenv.mkDerivation rec {
version = "4.0.10";
name = "libtiff-${version}";

src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
};

prePatch = let
debian = fetchurl {
# When the URL disappears, it typically means that Debian has new patches
# (probably security) and updating to new tarball will apply them as well.
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
};
in ''
tar xf ${debian}
patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
'';

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

nativeBuildInputs = [ pkgconfig ];