Author: raskin
Date: Fri Jul 1 13:29:42 2011
New Revision: 27573
URL: https://svn.nixos.org/websvn/nix/?rev=27573&sc=1
Log:
Updating graphviz and adding an old version
Added:
nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.24.nix
- copied, changed from r27566,
nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix
Modified:
nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.24.nix (from
r27566, nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix Fri Jul 1 07:01:46
2011 (r27566, copy source)
+++ nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.24.nix Fri Jul 1 13:29:42
2011 (r27573)
@@ -5,11 +5,11 @@
assert libpng != null && libjpeg != null && expat != null;
stdenv.mkDerivation rec {
- name = "graphviz-2.0";
+ name = "graphviz-2.24.0";
src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";;
- sha256 =
"39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
+ sha256 =
"01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00";
};
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool
fontconfig pango gd];
@@ -21,6 +21,7 @@
"--with-jpeglibdir=${libjpeg}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
+ "--with-codegens"
]
++ stdenv.lib.optional (x11 == null) "--without-x";
Modified: nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix Fri Jul 1
13:20:12 2011 (r27572)
+++ nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix Fri Jul 1
13:29:42 2011 (r27573)
@@ -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
- ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
+ pango gd zlib
+ ] ++ 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.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/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 13:20:12
2011 (r27572)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 13:29:42
2011 (r27573)
@@ -736,6 +736,11 @@
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.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
