From 704e51d3e21549e353c2bece522451db7d9ccfc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Nov 2008 15:53:07 +0000
Subject: [PATCH] * Reenable the check phase in Bison 2.4. * Use the passthru
 attribute.

svn path=/nixpkgs/trunk/; revision=13295
---
 pkgs/development/tools/parsing/bison/bison-1.875.nix | 7 ++-----
 pkgs/development/tools/parsing/bison/bison-2.3.nix   | 4 ++--
 pkgs/development/tools/parsing/bison/bison-2.4.nix   | 7 +++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix
index 6a2ae1c794d6..da124fcc474d 100644
--- a/pkgs/development/tools/parsing/bison/bison-1.875.nix
+++ b/pkgs/development/tools/parsing/bison/bison-1.875.nix
@@ -5,12 +5,9 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875";
   src = fetchurl {
-    urls = [ http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2 
-	ftp://ftp.gnu.org/pub/gnu/bison/bison-1.875.tar.bz2 
-      ];
+    urls = mirror://gnu/bison/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
   buildInputs = [m4];
-} // {
-  glrSupport = false;
+  passthru = { glrSupport = true; };
 }
diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix
index 4081f03cea8f..ae90f2e83d0e 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.3.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.3.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation {
 
     license = "GPLv2+";
   };
-} // {
-  glrSupport = true;
+ 
+  passthru = { glrSupport = true; };
 }
diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
index a0037e24f402..09596f173d01 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [m4];
 
-  #doCheck = true;
-  doCheck = false;
+  doCheck = true;
 
   meta = {
     description = "GNU Bison, a Yacc-compatible parser generator";
@@ -34,6 +33,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
   };
-} // {
-  glrSupport = true;
+
+  passthru = { glrSupport = true; };
 }