Merge ^/nixpkgs/trunk

svn tried to change libpng/default.nix version, I've changed libpng/12.nix version manually. svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
parent 024c247807 668a505214
commit 5c6a3faf4e
23 changed files with 156 additions and 59 deletions
@@ -3,11 +3,11 @@
 assert zlib != null;

 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 ];