From 526f4172c282e1d6443d7b94562a6679e15a8597 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jan 2012 10:42:34 +0000 Subject: [PATCH 1/3] haskell-skein: updated to version 0.1.0.4 svn path=/nixpkgs/trunk/; revision=31453 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index cd7f2115074..b1911310e24 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.3"; - sha256 = "1lag86db793l7n6zg97kn5wv31dal5sb8wig4sr7kqschxszq44d"; + version = "0.1.0.4"; + sha256 = "1m910kvm1ba9cl3ghr6j393xf1lvxb4ms55nipnzc5zg7r2xzh96"; buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From 83ed01cc123c3b050a54271750d476e5cfb3491e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jan 2012 10:42:38 +0000 Subject: [PATCH 2/3] haskell-zlib-bindings: updated to version 0.0.2 svn path=/nixpkgs/trunk/; revision=31454 --- .../development/libraries/haskell/zlib-bindings/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 6398ba4b275..66068cb5d0f 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,10 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.0.1"; - sha256 = "0m8q155yyrd4q1ddfmmhdx88mg1875ywrlr484qwpcyd58gn3bkv"; - isLibrary = true; - isExecutable = true; + version = "0.0.2"; + sha256 = "01ksbrlcn9g74ql0388zfa02abmrpkw654y2ayybzgygzdb51mnk"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From 4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 9 Jan 2012 17:55:31 +0000 Subject: [PATCH 3/3] update darktable, apply upstream libpng-15 patch svn path=/nixpkgs/trunk/; revision=31458 --- .../graphics/darktable/default.nix | 4 ++-- .../graphics/darktable/libpng-15.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/darktable/libpng-15.patch diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b0452bba115..c47ed07a48d 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.3"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; + sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw"; }; buildInputs = diff --git a/pkgs/applications/graphics/darktable/libpng-15.patch b/pkgs/applications/graphics/darktable/libpng-15.patch new file mode 100644 index 00000000000..f817a326448 --- /dev/null +++ b/pkgs/applications/graphics/darktable/libpng-15.patch @@ -0,0 +1,22 @@ +commit 5803d31ae7704e0349821dcc20a94a1cddda69f1 +Author: Tim Harder +Date: Wed Sep 21 14:13:55 2011 -0700 + + Fix build with libpng-1.5 + + Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and + Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore + via the png.h header. + +diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c +index 40c7d48..c7be566 100644 +--- a/src/imageio/format/png.c ++++ b/src/imageio/format/png.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + DT_MODULE(1) +