diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
| commit | 552fd3d599851336aa21ef073d1f7836566e454f (patch) | |
| tree | b2ebdeaa32426d12e21020410a0eb1a12881f8f6 /pkgs/development/libraries/libtiff | |
| parent | cc61d31902d67b94333f53a5ab5772330bbc21cc (diff) | |
| parent | 9dc35999602bc3bf2d7358a9ff79b9530e8d1975 (diff) | |
| download | nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.gz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.bz2 nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.lz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.xz nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.tar.zst nixpkgs-552fd3d599851336aa21ef073d1f7836566e454f.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/libtiff')
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 44b28645927..5101429a403 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libjpeg }: -let version = "3.9.7"; in +let version = "4.0.3"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; + sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; }; outputs = [ "dev" "out" "bin" "doc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://www.libtiff.org/; + homepage = http://www.remotesensing.org/libtiff/; license = "bsd"; }; } |