From 85230c348a8df0cd5ee9fe1f9b1f9b3d009ee8ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Oct 2006 15:14:17 +0000
Subject: [PATCH] * Some Bison/Flex refactoring. * Added Bison 2.3.

svn path=/nixpkgs/trunk/; revision=6635
---
 .../parsing/bison/{default.nix => bison-1.875.nix} |  0
 .../bison/{bison-new.nix => bison-1.875d.nix}      |  0
 pkgs/development/tools/parsing/bison/bison-2.1.nix | 14 --------------
 .../parsing/flex/{flex-new.nix => flex-2.5.33.nix} |  0
 .../parsing/flex/{default.nix => flex-2.5.4a.nix}  |  0
 pkgs/top-level/all-packages.nix                    | 14 +++++++++-----
 pkgs/top-level/build-for-release.nix               |  4 ++--
 7 files changed, 11 insertions(+), 21 deletions(-)
 rename pkgs/development/tools/parsing/bison/{default.nix => bison-1.875.nix} (100%)
 rename pkgs/development/tools/parsing/bison/{bison-new.nix => bison-1.875d.nix} (100%)
 delete mode 100644 pkgs/development/tools/parsing/bison/bison-2.1.nix
 rename pkgs/development/tools/parsing/flex/{flex-new.nix => flex-2.5.33.nix} (100%)
 rename pkgs/development/tools/parsing/flex/{default.nix => flex-2.5.4a.nix} (100%)

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix
similarity index 100%
rename from pkgs/development/tools/parsing/bison/default.nix
rename to 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
similarity index 100%
rename from pkgs/development/tools/parsing/bison/bison-new.nix
rename to 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
similarity index 100%
rename from pkgs/development/tools/parsing/flex/flex-new.nix
rename to 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
similarity index 100%
rename from pkgs/development/tools/parsing/flex/default.nix
rename to 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