Author: simons
Date: Wed Jul 13 12:00:19 2011
New Revision: 27753
URL: https://svn.nixos.org/websvn/nix/?rev=27753&sc=1
Log:
ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with
the i686 version of this compiler
Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on
Darwin. Duh.
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Wed Jul
13 11:40:47 2011 (r27752)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Wed Jul
13 12:00:19 2011 (r27753)
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-assert stdenv.system == "x86_64-darwin" || stdenv.system == "i686-darwin" ||
stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
version = "6.10.1";
@@ -20,7 +20,7 @@
url =
"http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";;
sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg";
}
- else if (stdenv.system == "i686-darwin" || stdenv.system ==
"x86_64-darwin") then
+ else if stdenv.system == "i686-darwin" then
fetchurl {
# Idem.
url =
"http://haskell.org/ghc/dist/${version}/maeder/ghc-${version}-i386-apple-darwin.tar.bz2";;
@@ -100,10 +100,5 @@
[ $(./main) == "yes" ]
'';
- meta = {
- homepage = "http://haskell.org/ghc";;
- description = "The Glasgow Haskell Compiler";
- maintainers = [ stdenv.lib.maintainers.simons ];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- };
+ meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
