Updating graphviz and adding an old version

svn path=/nixpkgs/trunk/; revision=27573

pkgs/tools/graphics/graphviz/2.24.nix

@@ -0,0 +1,32 @@
+{ 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/graphviz/default.nix

@@ -3,17 +3,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "graphviz-2.26.3";
+  name = "graphviz-2.28.0";
 
   src = fetchurl {
     url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l";
+    sha256 = "0xpwg99cd8sp0c6r8klsmc66h1pday64kmnr4v6f9jkqqmrpkank";
   };
 
   buildInputs =
     [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
-      pango gd
+      pango gd zlib
-    ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
+    ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
+    ++ stdenv.lib.optionals (gtk != null) [ gtk glib ];
   
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
@@ -25,6 +26,10 @@ stdenv.mkDerivation rec {
     ]
     ++ stdenv.lib.optional (xlibs == null) "--without-x";
 
+  preBuild = ''
+    sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
+  '';
+
   meta = {
     description = "A program for visualising graphs";
     homepage = http://www.graphviz.org/;

pkgs/top-level/all-packages.nix

@@ -736,6 +736,11 @@ let
     inherit (gtkLibs) pango;
   };
 
+  /* Last version to export to dia */
+  graphviz_2_24 = callPackage ../tools/graphics/graphviz/2.0.nix {
+    inherit (gtkLibs) pango;
+  };
+
   /* Readded by Michael Raskin. There are programs in the wild
    * that do want 2.0 but not 2.22. Please give a day's notice for
    * objections before removal.