Author: viric
Date: Fri Jan 27 15:11:17 2012
New Revision: 31883
URL: https://nixos.org/websvn/nix/?rev=31883&sc=1
Log:
Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.
Modified:
nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix
nixpkgs/trunk/pkgs/development/tools/misc/gdb/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix Fri Jan
27 15:05:35 2012 (r31882)
+++ nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix Fri Jan
27 15:11:17 2012 (r31883)
@@ -8,7 +8,7 @@
, 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 {
name = "libreoffice-3.4.5.2";
Modified: nixpkgs/trunk/pkgs/development/tools/misc/gdb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/misc/gdb/default.nix Fri Jan 27
15:05:35 2012 (r31882)
+++ nixpkgs/trunk/pkgs/development/tools/misc/gdb/default.nix Fri Jan 27
15:11:17 2012 (r31883)
@@ -14,7 +14,7 @@
basename =
if bleedingEdgeVersion
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
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
@@ -40,7 +40,7 @@
url = "mirror://gnu/gdb/${basename}.tar.bz2";
# md5 is provided by the annoucement page
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
- md5 = "b89a5fac359c618dda97b88645ceab47";
+ md5 = "95a9a8305fed4d30a30a6dc28ff9d060";
};
# I think python is not a native input, but I leave it
@@ -75,6 +75,8 @@
rm -v $out/share/info/{standards,configure,bfd}.info
'';
+ enableParallelBuilding = true;
+
# TODO: Investigate & fix the test failures.
doCheck = false;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 27 15:05:35
2012 (r31882)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 27 15:11:17
2012 (r31883)
@@ -3154,13 +3154,11 @@
uisp = callPackage ../development/tools/misc/uisp { };
gdb = callPackage ../development/tools/misc/gdb {
- readline = readline5;
hurd = gnu.hurdCross;
inherit (gnu) mig;
};
gdbCross = callPackage ../development/tools/misc/gdb {
- readline = readline5;
target = crossSystem;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
