svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
parent cdece69773 668a505214
commit 313a029f16
45 changed files with 227 additions and 214 deletions
@@ -4,11 +4,11 @@ assert zlib != null;

 # If you want to upgrade libpng, look at libpng15 branch
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.46";
+  name = "libpng-1.2.47";
  
  src = fetchurl {
    url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
+    sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
  };
  
  propagatedBuildInputs = [ zlib ];