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

Commits on Nov 7, 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.
    @andrew-d
    andrew-d committed Nov 7, 2018
    Copy the full SHA
    3137c60 View commit details

Commits on Nov 10, 2018

  1. Merge pull request #49860 from andrew-d/andrew/upgrade-libtiff 

    libtiff: 4.0.9 -> 2018-11-04
    @Mic92
    Mic92 authored Nov 10, 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
    f2d2a8f View commit details
Showing with 24 additions and 22 deletions.
  1. +24 −22 pkgs/development/libraries/libtiff/default.nix
46 changes: 24 additions & 22 deletions pkgs/development/libraries/libtiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
{ stdenv
, fetchFromGitLab

let
version = "4.0.9";
in
stdenv.mkDerivation rec {
name = "libtiff-${version}";
, pkgconfig
, autogen
, autoconf
, automake
, libtool

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

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)"
'';
stdenv.mkDerivation rec {
version = "2018-11-04";
name = "libtiff-unstable-${version}";

src = fetchFromGitLab {
owner = "libtiff";
repo = "libtiff";
rev = "779e54ca32b09155c10d398227a70038de399d7d";
sha256 = "029fmn0rdmb5gxhg83ff9j2zx3qk6wsiaiv554jq26pdc23achsp";
};

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

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autogen autoconf automake libtool ];

propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)

enableParallelBuilding = true;

preConfigure = "./autogen.sh";

doCheck = true; # not cross;

meta = with stdenv.lib; {