Author: ludo
Date: Thu Jul 21 13:18:42 2011
New Revision: 27873
URL: https://svn.nixos.org/websvn/nix/?rev=27873&sc=1

Log:
GCC-Apple64: Upgrade to 5666.3.

Modified:
   
nixpkgs/branches/darwin-updates/pkgs/development/compilers/gcc-apple64/default.nix

Modified: 
nixpkgs/branches/darwin-updates/pkgs/development/compilers/gcc-apple64/default.nix
==============================================================================
--- 
nixpkgs/branches/darwin-updates/pkgs/development/compilers/gcc-apple64/default.nix
  Thu Jul 21 13:18:39 2011        (r27872)
+++ 
nixpkgs/branches/darwin-updates/pkgs/development/compilers/gcc-apple64/default.nix
  Thu Jul 21 13:18:42 2011        (r27873)
@@ -8,13 +8,19 @@
 assert stdenv.isDarwin;
 assert langF77 -> gmp != null;
 
+let
+  version  = "4.2.1";   # Upstream GCC version, from `gcc/BASE-VER'.
+  revision = "5666.3";  # Apple's fork revision number.
+in
 stdenv.mkDerivation ({
-  name = "gcc-4.2.1-apple-5646";
+  name = "gcc-apple-${version}.${revision}";
+
   builder = ./builder.sh;
-  src = 
+
+  src =
     stdenv.lib.optional /*langC*/ true (fetchurl {
-      url = http://www.opensource.apple.com/tarballs/gcc/gcc-5646.tar.gz;
-      sha256 = "13jghyb098104kfym96iwwdvbj6snnws2c92h48lbd4fmyf1iv24";
+      url = 
"http://www.opensource.apple.com/tarballs/gcc/gcc-${revision}.tar.gz";;
+      sha256 = "0nq1szgqx9ryh1qsn5n6yd55gpvf56wr8f7w1jzabb8idlvz8ikc";
     }) ++
     stdenv.lib.optional langCC (fetchurl {
       url = 
http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ;
@@ -24,7 +30,7 @@
   enableParallelBuilding = true;
 
   libstdcxx = "libstdcxx-39";
-  sourceRoot = "gcc-5646/";
+  sourceRoot = "gcc-${revision}/";
   patches =
     [./pass-cxxcpp.patch ]
     ++ (if noSysDirs then [./no-sys-dirs.patch] else []);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to