diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f14bccc22cc..e6766978e2d 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -122,7 +122,7 @@ rec {
   };
 
   graphviz = (import ../tools/graphics/graphviz) {
-    inherit fetchurl stdenv libpng libjpeg expat x11;
+    inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
     inherit (xlibs) libXaw;
   };
 
@@ -229,19 +229,19 @@ rec {
     m4 = gnum4;
   };
 
+  yacc = bison;
+
   bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) {
     inherit fetchurl stdenv;
     m4 = gnum4;
   };
 
   flex = (import ../development/tools/parsing/flex) {
-    inherit fetchurl stdenv;
-    yacc = bison;
+    inherit fetchurl stdenv yacc;
   };
 
   flexnew = (import ../development/tools/parsing/flex/flex-new.nix) {
-    inherit fetchurl stdenv;
-    yacc = bison;
+    inherit fetchurl stdenv yacc;
     m4 = gnum4;
   };
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 1bd47bd7b59..8e03439e32e 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -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;
 
 stdenv.mkDerivation {
-  name = "graphviz-1.10";
+  name = "graphviz-1.12";
 
   src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
-    md5 = "e1402531abff68d146bf94e72b44dc2a";
-#    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
-#    md5 = "84910caae072c714d107ca9f3e54ace0";
+#    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
+#    md5 = "e1402531abff68d146bf94e72b44dc2a";
+    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
+    md5 = "a5c004c42f58c957f772060d0889059c";
   };
 
-  buildInputs = [x11 libpng libjpeg expat libXaw];
+  buildInputs = [x11 libpng libjpeg expat libXaw yacc];
   configureFlags = [
     (if x11 == null then "--without-x" else "")
   ];