* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557

pkgs/tools/graphics/graphviz/default.nix

@@ -4,12 +4,12 @@
 
 assert libpng != null && libjpeg != null && expat != null;
 
-stdenv.mkDerivation {
-  name = "graphviz-2.20.2";
+stdenv.mkDerivation rec {
+  name = "graphviz-2.20.3";
 
   src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.20.2.tar.gz;
-    sha256 = "13mw0mhr4n14c5q7a6c44cvggl5hiqbx53ynr53s67rldvzcilgm";
+    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
+    sha256 = "0grrijj3ryacnc0qj8l6xp5nqnmff5nvx6ziij1r9lghzb17cdjq";
   };
 
   buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];

pkgs/tools/graphics/netpbm/default.nix

@@ -0,0 +1,38 @@
+{stdenv, fetchsvn, libjpeg, libpng, flex, zlib, perl, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "netpbm-advanced-844";
+
+  src = fetchsvn {
+    url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
+    rev = 844;
+  };
+
+  buildInputs = [ flex zlib perl libpng libjpeg libxml2 ];
+
+  configurePhase = "cp config.mk.in config.mk";
+
+  installPhase = ''
+    make package pkgdir=$PWD/netpbmpkg
+    # Pass answers to the script questions
+    ./installnetpbm << EOF
+    $PWD/netpbmpkg
+    $out
+    Y
+    $out/bin
+    $out/lib
+    N
+    $out/lib
+    $out/lib
+    $out/include
+    $out/man
+    N
+    EOF
+  '';
+
+  meta = {
+    homepage = http://netpbm.sourceforge.net/;
+    description = "Toolkit for manipulation of graphic images";
+    license = "GPL,free";
+  };
+}

pkgs/tools/graphics/ploticus/default.nix

@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   patches = [./ploticus-install.patch];
 
   meta = {
-    description = ''Ploticus, a non-interactive software package for
-                    producing plots and charts'';
+    description = "A non-interactive software package for producing plots and charts";
 
     longDescription = ''Ploticus is a free, GPL'd, non-interactive
       software package for producing plots, charts, and graphics from