Author: urkud
Date: Mon Jan 9 17:58:22 2012
New Revision: 31459
URL: https://nixos.org/websvn/nix/?rev=31459&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/libpng-15.patch
- copied unchanged from r31458,
nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/skein/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/default.nix
Mon Jan 9 17:55:31 2012 (r31458)
+++ nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/default.nix
Mon Jan 9 17:58:22 2012 (r31459)
@@ -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 =
Copied:
nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/libpng-15.patch
(from r31458,
nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/applications/graphics/darktable/libpng-15.patch
Mon Jan 9 17:58:22 2012 (r31459, copy of r31458,
nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch)
@@ -0,0 +1,22 @@
+commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
+Author: Tim Harder <[email protected]>
+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 <stdio.h>
+ #include <png.h>
+ #include <inttypes.h>
++#include <zlib.h>
+
+ DT_MODULE(1)
+
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/skein/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/skein/default.nix
Mon Jan 9 17:55:31 2012 (r31458)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/skein/default.nix
Mon Jan 9 17:58:22 2012 (r31459)
@@ -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.";
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
Mon Jan 9 17:55:31 2012 (r31458)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
Mon Jan 9 17:58:22 2012 (r31459)
@@ -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";;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
