From b0359cdf11c8ab66b50bb4ba943472c971b1288b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jun 2012 09:28:17 -0400
Subject: [PATCH] gdb: Drop outdated "bleeding edge" version

Also note that Nixpkgs shoould ship "bleeding edge" versions unless
there is some compelling reason.
---
 pkgs/development/tools/misc/gdb/default.nix | 37 +++++++--------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 8cde30737d2..3b394b235c1 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,20 +1,14 @@
 { fetchurl, fetchgit, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
 , dejagnu, python, target ? null
 
-# Set it to true to fetch the latest release/branchpoint from git.
-, bleedingEdgeVersion ? false
-
 # Additional dependencies for GNU/Hurd.
 , mig ? null, hurd ? null
 
-# needed for the git version
-, flex, bison }:
+}:
 
 let
-  basename =
-    if bleedingEdgeVersion
-    then "gdb-7.3.20110726"
-    else "gdb-7.4.1";
+
+  basename = "gdb-7.4.1";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
@@ -22,6 +16,7 @@ let
   isGNU =
       stdenv.system == "i686-gnu"
       || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu");
+
 in
 
 assert isGNU -> mig != null && hurd != null;
@@ -30,36 +25,28 @@ stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (target != null)
       ("-" + target.config);
 
-  src =
-    if bleedingEdgeVersion
-    then fetchgit {
-        url = "git://sourceware.org/git/gdb.git";
-        rev = "refs/tags/gdb_7_3-2011-07-26-release";
-      }
-    else fetchurl {
-        url = "mirror://gnu/gdb/${basename}.tar.bz2";
-        # md5 is provided by the annoucement page
-        # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
-        md5 = "8854d34691087ec127d934692639855f";
-      };
+  src = fetchurl {
+    url = "mirror://gnu/gdb/${basename}.tar.bz2";
+    md5 = "8854d34691087ec127d934692639855f";
+  };
 
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
   buildNativeInputs = [ texinfo python ]
-    ++ stdenv.lib.optional isGNU mig
-    ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ];
+    ++ stdenv.lib.optional isGNU mig;
 
   buildInputs = [ ncurses readline gmp mpfr expat ]
     ++ stdenv.lib.optional isGNU hurd
     ++ stdenv.lib.optional doCheck dejagnu;
 
+  enableParallelBuilding = true;
+
   configureFlags = with stdenv.lib;
     '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
        --with-expat --with-libexpat-prefix=${expat}
     ''
     + optionalString (target != null) " --target=${target.config}"
-    + optionalString (elem stdenv.system platforms.cygwin) "  --without-python"
-  ;
+    + optionalString (elem stdenv.system platforms.cygwin) "  --without-python";
 
   crossAttrs = {
     # Do not add --with-python here to avoid cross building it.