svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32522

pkgs/tools/graphics/graphviz/2.24.nix

@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
-, yacc, libtool, fontconfig, pango, gd
-}:
-
-assert libpng != null && libjpeg != null && expat != null;
-
-stdenv.mkDerivation rec {
-  name = "graphviz-2.24.0";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00";
-  };
-
-  buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
-  
-  configureFlags =
-    [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
-      "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
-      "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
-      "--with-codegens"
-    ]
-    ++ stdenv.lib.optional (x11 == null) "--without-x";
-
-  meta = {
-    description = "A program for visualising graphs";
-    homepage = http://www.graphviz.org/;
-  };
-}

pkgs/tools/graphics/netpbm/default.nix

@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchsvn {
     url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
-    rev = 1177;
-    sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f";
+    rev = 1656;
+    sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9";
   };
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";