Author: ludo Date: 2010-06-15 15:01:15 +0000 (Tue, 15 Jun 2010) New Revision: 22278
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22278&view=rev Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.11/common.nix nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix nixpkgs/trunk/pkgs/os-specific/gnu/mach/default.nix nixpkgs/trunk/pkgs/os-specific/gnu/mig/default.nix Log: Cross-GNU: Fix Git revision names. Changes: Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.11/common.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/glibc-2.11/common.nix 2010-06-15 12:23:28 UTC (rev 22277) +++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.11/common.nix 2010-06-15 15:01:15 UTC (rev 22278) @@ -10,8 +10,9 @@ , preConfigure ? "", ... }...@args : let - date = "2010-05-12"; - rev = "tschwinge/roger_whitta...@{${date}}"; + # For GNU/Hurd, see below. + date = "20100512"; + rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f"; version = if hurdHeaders != null then date else "2.11.1"; in Modified: nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix =================================================================== --- nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix 2010-06-15 12:23:28 UTC (rev 22277) +++ nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix 2010-06-15 15:01:15 UTC (rev 22278) @@ -6,8 +6,10 @@ assert (cross != null) -> (gccCross != null); let - date = "2010-05-12"; - rev = "mas...@{${date}}"; + # Unfortunately we can't use `mas...@{date}', see + # <http://www.bramschoenmakers.nl/en/node/645>. + date = "20100512"; + rev = "7913beaef3e6a2c4f7f315a8db7a31dbe1f713e0"; suffix = if headersOnly then "-headers" else (if buildTarget != "all" Modified: nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix =================================================================== --- nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix 2010-06-15 12:23:28 UTC (rev 22277) +++ nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix 2010-06-15 15:01:15 UTC (rev 22278) @@ -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_herbolzhei...@{${date}}"; + rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9"; in stdenv.mkDerivation ({ name = "libpthread-hurd-${date}"; Modified: nixpkgs/trunk/pkgs/os-specific/gnu/mach/default.nix =================================================================== --- nixpkgs/trunk/pkgs/os-specific/gnu/mach/default.nix 2010-06-15 12:23:28 UTC (rev 22277) +++ nixpkgs/trunk/pkgs/os-specific/gnu/mach/default.nix 2010-06-15 15:01:15 UTC (rev 22278) @@ -4,8 +4,8 @@ assert (!headersOnly) -> (mig != null); let - date = "2010-05-12"; - rev = "mas...@{${date}}"; + date = "20100512"; + rev = "7987a711e8f13c0543e87a0211981f4b40ef6d94"; in stdenv.mkDerivation ({ name = "gnumach${if headersOnly then "-headers" else ""}-${date}"; Modified: nixpkgs/trunk/pkgs/os-specific/gnu/mig/default.nix =================================================================== --- nixpkgs/trunk/pkgs/os-specific/gnu/mig/default.nix 2010-06-15 12:23:28 UTC (rev 22277) +++ nixpkgs/trunk/pkgs/os-specific/gnu/mig/default.nix 2010-06-15 15:01:15 UTC (rev 22278) @@ -1,8 +1,8 @@ { fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders }: let - date = "2010-05-12"; - rev = "mas...@{${date}}"; + date = "20100512"; + rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8"; in stdenv.mkDerivation { name = "mig-${date}"; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
