* Some Bison/Flex refactoring.

* Added Bison 2.3.

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

7 files changed, 11 insertions, 21 deletions

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix
index 92aeafb335a4..92aeafb335a4 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/bison-1.875.nix
diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-1.875d.nix
index 4bdab887ba5c..4bdab887ba5c 100644
--- a/pkgs/development/tools/parsing/bison/bison-new.nix
+++ b/pkgs/development/tools/parsing/bison/bison-1.875d.nix
diff --git a/pkgs/development/tools/parsing/bison/bison-2.1.nix b/pkgs/development/tools/parsing/bison/bison-2.1.nix
deleted file mode 100644
index e28d16dc79cb..000000000000
--- a/pkgs/development/tools/parsing/bison/bison-2.1.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, m4}:
-
-assert m4 != null;
-
-stdenv.mkDerivation {
-  name = "bison-2.1";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bison-2.1.tar.bz2;
-    md5 = "ef3110077462b1140b2ae612626e8486";
-  };
-  buildInputs = [m4];
-} // {
-  glrSupport = true;
-}
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
index 74948bcf2c91..74948bcf2c91 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix
index 2d146eeca250..2d146eeca250 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d2fe6cba6ad..57a9eee5d545 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -567,12 +567,14 @@ rec {
     inherit fetchurl stdenv noSysDirs;
   };
 
-  bison = (import ../development/tools/parsing/bison) {
+  bison = bison1875;
+
+  bison1875 = (import ../development/tools/parsing/bison/bison-1.875.nix) {
     inherit fetchurl stdenv;
     m4 = gnum4;
   };
 
-  bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) {
+  bison23 = (import ../development/tools/parsing/bison/bison-2.3.nix) {
     inherit fetchurl stdenv;
     m4 = gnum4;
   };
@@ -604,7 +606,9 @@ rec {
     ant = apacheAntBlackdown14;
   };
 
-  flex = (import ../development/tools/parsing/flex) {
+  flex = flex254a;
+
+  flex254a = (import ../development/tools/parsing/flex/flex-2.5.4a.nix) {
     inherit fetchurl stdenv yacc;
   };
 
@@ -612,7 +616,7 @@ rec {
   #  inherit stdenv flex ;
   #};
 
-  flexnew = (import ../development/tools/parsing/flex/flex-new.nix) {
+  flex2533 = (import ../development/tools/parsing/flex/flex-2.5.33.nix) {
     inherit fetchurl stdenv yacc;
     m4 = gnum4;
   };
@@ -1544,7 +1548,7 @@ rec {
 
   Xaw3d = import ../development/libraries/Xaw3d {
     inherit fetchurl stdenv x11 bison;
-    flex = flexnew;
+    flex = flex2533;
     inherit (xlibs) imake gccmakedep libXmu libXpm libXp;
   };
 
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 788ee216dd1c..6142b1fdbf39 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -15,7 +15,7 @@ let {
     bash
     batik
     binutils
-    bisonnew
+    bison23
     bittorrent
     blackdown
     bmp
@@ -166,7 +166,7 @@ let {
     aterm
     autoconf
     automake19x
-    bisonnew
+    bison23
     docbook5
     docbook_xml_dtd_42
     docbook_xml_dtd_43