Author: ludo
Date: Thu Jun 23 21:14:35 2011
New Revision: 27536
URL: https://svn.nixos.org/websvn/nix/?rev=27536&sc=1
Log:
glibc: Update Hurd snapshot.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix Thu Jun
23 20:56:37 2011 (r27535)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix Thu Jun
23 21:14:35 2011 (r27536)
@@ -11,7 +11,7 @@
let
# For GNU/Hurd, see below.
- version = if hurdHeaders != null then "20110622" else "2.12.2";
+ version = if hurdHeaders != null then "20110623" else "2.12.2";
needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -73,10 +73,7 @@
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
-
- ]
-
- ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-pthread.patch);
+ ];
postPatch = ''
# Needed for glibc to build with the gnumake 3.82
@@ -144,8 +141,8 @@
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
url = "git://git.sv.gnu.org/hurd/glibc.git";
- sha256 =
"7b7bba027f17f30773ba73e97adb319c4bf75caab96e867d76ea33ae3b0f68ba";
- rev = "239939de899afa3cfcd9f92e1dbc09225fc7f558";
+ sha256 =
"e51c6b0bb8544ee4547fda22272bfa6a23677655d15da3c041be6e820f37f844";
+ rev = "05862f9210fb029df3773ef004af954461f07478";
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
