summary refs log tree commit diff
path: root/pkgs/development/libraries/libpng
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-31 12:23:18 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-31 12:23:18 +0200
commit8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (patch)
tree0fbbc6b2a4103f52619d0df114015d79b1bb9f49 /pkgs/development/libraries/libpng
parent4c3e6a46754f32c059484b25e35925a92a7c9574 (diff)
parentacba6b4da25e4b92e2422036104ad2040bef1acd (diff)
downloadnixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.gz
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.bz2
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.lz
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.xz
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.zst
nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.zip
Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
Diffstat (limited to 'pkgs/development/libraries/libpng')
-rw-r--r--pkgs/development/libraries/libpng/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0056212dfbb4..fa5c64eb9119 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.12";
-  sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3";
+  version = "1.6.13";
+  sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0";
+    sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;