From dfc62c908426920fba9286e66873343a8b1358b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 14:25:42 +0100
Subject: [PATCH] bison: Don't run the tests

All this accomplishes is to make bison depend on flex, which in turn
depends on bison.  (So as a result, during the stdenv bootstrap, bison
gets built 6 (!) times.)
---
 pkgs/development/tools/parsing/bison/3.x.nix | 6 ++----
 pkgs/top-level/all-packages.nix              | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 2e3a4f8d497..284223905f6 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, flex }:
+{ stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.2";
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
   };
 
-  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optionals doCheck [ flex ];
+  nativeBuildInputs = [ m4 perl ];
   propagatedBuildInputs = [ m4 ];
 
-  doCheck = flex != null;
-
   meta = {
     homepage = "http://www.gnu.org/software/bison/";
     description = "GNU Bison, a Yacc-compatible parser generator";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38791ec46df..4f8bb74306a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3500,11 +3500,7 @@ let
 
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
-  flex = callPackage ../development/tools/parsing/flex {
-    # Break infinite recursion: bison's test suite needs flex, so we
-    # use an untested bison build to build flex first.
-    yacc = bison.override { flex = null; };
-  };
+  flex = callPackage ../development/tools/parsing/flex { };
 
   m4 = gnum4;