public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Graphviz updated to 1.12.

Browse Source 
* In all-packages-generic.nix: yacc alias for bison.

svn path=/nixpkgs/trunk/; revision=1488
This commit is contained in:
Eelco Dolstra 2004-09-22 08:49:22 +00:00
parent 35ed8aac81
commit f3193ba5bc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/system/all-packages-generic.nix
View File

@ -122,7 +122,7 @@ rec {
}; };
graphviz = (import ../tools/graphics/graphviz) { graphviz = (import ../tools/graphics/graphviz) {
inherit fetchurl stdenv libpng libjpeg expat x11; inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
inherit (xlibs) libXaw; inherit (xlibs) libXaw;
}; };
@ -229,19 +229,19 @@ rec {
m4 = gnum4; m4 = gnum4;
}; };
yacc = bison;
bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) { bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
m4 = gnum4; m4 = gnum4;
}; };
flex = (import ../development/tools/parsing/flex) { flex = (import ../development/tools/parsing/flex) {
inherit fetchurl stdenv; inherit fetchurl stdenv yacc;
yacc = bison;
}; };
flexnew = (import ../development/tools/parsing/flex/flex-new.nix) { flexnew = (import ../development/tools/parsing/flex/flex-new.nix) {
inherit fetchurl stdenv; inherit fetchurl stdenv yacc;
yacc = bison;
m4 = gnum4; m4 = gnum4;
}; };

14
pkgs/tools/graphics/graphviz/default.nix
View File

@ -1,18 +1,18 @@
{stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw}: {stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw, yacc}:
assert libpng != null && libjpeg != null && expat != null; assert libpng != null && libjpeg != null && expat != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "graphviz-1.10"; name = "graphviz-1.12";
src = fetchurl { src = fetchurl {
url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz; # url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
md5 = "e1402531abff68d146bf94e72b44dc2a"; # md5 = "e1402531abff68d146bf94e72b44dc2a";
# url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz; url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
# md5 = "84910caae072c714d107ca9f3e54ace0"; md5 = "a5c004c42f58c957f772060d0889059c";
}; };
buildInputs = [x11 libpng libjpeg expat libXaw]; buildInputs = [x11 libpng libjpeg expat libXaw yacc];
configureFlags = [ configureFlags = [
(if x11 == null then "--without-x" else "") (if x11 == null then "--without-x" else "")
]; ];