cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #26452: libtiff: 4.0.7-6 -> 4.0.8-2

Browse source
This commit is contained in:
Vladimír Čunát 2017-06-07 18:11:47 +02:00
commit bbec4f5af7
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/libtiff/default.nix
View file

@ -1,21 +1,20 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
let let
version = "4.0.7"; version = "4.0.8";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtiff-${version}"; name = "libtiff-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"; sha256 = "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr";
}; };
prePatch =let prePatch =let
# https://lwn.net/Vulnerabilities/711777/ and more patched in *-6 -> *-7
debian = fetchurl { debian = fetchurl {
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-6.debian.tar.xz; url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz;
sha256 = "9c9048c28205bdbeb5ba36c7a194d0cd604bd137c70961607bfc8a079be5fa31"; sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng";
}; };
in '' in ''
tar xf '${debian}' tar xf '${debian}'