Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge. svn path=/nixpkgs/trunk/; revision=31883
This commit is contained in:
parent
41445f89c3
commit
29ca4d272f
|
@ -8,7 +8,7 @@
|
||||||
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
|
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
|
||||||
}:
|
}:
|
||||||
|
|
||||||
throw "The expression for libreoffice is still not ready"
|
# throw "The expression for libreoffice is still not ready"
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libreoffice-3.4.5.2";
|
name = "libreoffice-3.4.5.2";
|
||||||
|
|
|
@ -14,7 +14,7 @@ let
|
||||||
basename =
|
basename =
|
||||||
if bleedingEdgeVersion
|
if bleedingEdgeVersion
|
||||||
then "gdb-7.3.20110726"
|
then "gdb-7.3.20110726"
|
||||||
else "gdb-7.3.1";
|
else "gdb-7.4";
|
||||||
|
|
||||||
# Whether (cross-)building for GNU/Hurd. This is an approximation since
|
# Whether (cross-)building for GNU/Hurd. This is an approximation since
|
||||||
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
|
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
url = "mirror://gnu/gdb/${basename}.tar.bz2";
|
url = "mirror://gnu/gdb/${basename}.tar.bz2";
|
||||||
# md5 is provided by the annoucement page
|
# md5 is provided by the annoucement page
|
||||||
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
|
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
|
||||||
md5 = "b89a5fac359c618dda97b88645ceab47";
|
md5 = "95a9a8305fed4d30a30a6dc28ff9d060";
|
||||||
};
|
};
|
||||||
|
|
||||||
# I think python is not a native input, but I leave it
|
# I think python is not a native input, but I leave it
|
||||||
|
@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
|
||||||
rm -v $out/share/info/{standards,configure,bfd}.info
|
rm -v $out/share/info/{standards,configure,bfd}.info
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
# TODO: Investigate & fix the test failures.
|
# TODO: Investigate & fix the test failures.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -3154,13 +3154,11 @@ let
|
||||||
uisp = callPackage ../development/tools/misc/uisp { };
|
uisp = callPackage ../development/tools/misc/uisp { };
|
||||||
|
|
||||||
gdb = callPackage ../development/tools/misc/gdb {
|
gdb = callPackage ../development/tools/misc/gdb {
|
||||||
readline = readline5;
|
|
||||||
hurd = gnu.hurdCross;
|
hurd = gnu.hurdCross;
|
||||||
inherit (gnu) mig;
|
inherit (gnu) mig;
|
||||||
};
|
};
|
||||||
|
|
||||||
gdbCross = callPackage ../development/tools/misc/gdb {
|
gdbCross = callPackage ../development/tools/misc/gdb {
|
||||||
readline = readline5;
|
|
||||||
target = crossSystem;
|
target = crossSystem;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue