From 9991b4f4c61416f1dc211b376f6669b8a92fd2d0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 15 Jun 2010 15:01:15 +0000
Subject: Cross-GNU: Fix Git revision names.

svn path=/nixpkgs/trunk/; revision=22278
---
 pkgs/development/libraries/glibc-2.11/common.nix | 5 +++--
 pkgs/os-specific/gnu/hurd/default.nix            | 6 ++++--
 pkgs/os-specific/gnu/libpthread/default.nix      | 6 +++---
 pkgs/os-specific/gnu/mach/default.nix            | 4 ++--
 pkgs/os-specific/gnu/mig/default.nix             | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix
index 3f0db7d46b72..b792e8447e74 100644
--- a/pkgs/development/libraries/glibc-2.11/common.nix
+++ b/pkgs/development/libraries/glibc-2.11/common.nix
@@ -10,8 +10,9 @@ cross :
 , preConfigure ? "", ... }@args :
 
 let
-  date = "2010-05-12";
-  rev = "tschwinge/Roger_Whittaker@{${date}}";
+  # For GNU/Hurd, see below.
+  date = "20100512";
+  rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
   version = if hurdHeaders != null then date else "2.11.1";
 in
 
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 88203a31d3b1..cfd88692ead4 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -6,8 +6,10 @@
 assert (cross != null) -> (gccCross != null);
 
 let
-  date   = "2010-05-12";
-  rev    = "master@{${date}}";
+  # Unfortunately we can't use `master@{DATE}', see
+  # <http://www.bramschoenmakers.nl/en/node/645>.
+  date   = "20100512";
+  rev    = "7913beaef3e6a2c4f7f315a8db7a31dbe1f713e0";
   suffix = if headersOnly
            then "-headers"
            else (if buildTarget != "all"
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 11adc6187912..87ad5f2b631d 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -5,11 +5,11 @@
 assert (cross != null) -> (gccCross != null) && (glibcCross != null);
 
 let
-  date = "2010-05-12";
+  date = "20100512";
 
-  # Use the weird branch prescribed in
+  # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in
   # <http://www.gnu.org/software/hurd/hurd/building/cross-compiling.html>.
-  rev = "tschwinge/Peter_Herbolzheimer@{${date}}";
+  rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9";
 in
 stdenv.mkDerivation ({
   name = "libpthread-hurd-${date}";
diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index 95b3921ee2b7..146633e00b21 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -4,8 +4,8 @@
 assert (!headersOnly) -> (mig != null);
 
 let
-  date = "2010-05-12";
-  rev = "master@{${date}}";
+  date = "20100512";
+  rev = "7987a711e8f13c0543e87a0211981f4b40ef6d94";
 in
 stdenv.mkDerivation ({
   name = "gnumach${if headersOnly then "-headers" else ""}-${date}";
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 68951e84e2d5..668229b101f6 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -1,8 +1,8 @@
 { fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders }:
 
 let
-  date = "2010-05-12";
-  rev = "master@{${date}}";
+  date = "20100512";
+  rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8";
 in
 stdenv.mkDerivation {
   name = "mig-${date}";
-- 
cgit 1.4.1