From c11749dcd652cb986efdb3ddd704b41c07208c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 16 Dec 2011 18:11:23 +0000
Subject: [PATCH] Updated the GHC HEAD snapshot.

svn path=/nixpkgs/trunk/; revision=30937
---
 pkgs/development/compilers/ghc/head.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix         |  3 ++-
 pkgs/top-level/haskell-packages.nix     | 13 +++++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8e60b4f2fc1..330165437d5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.3.20110910";
+  version = "7.3.20111212";
 
   name = "ghc-${version}";
 
-  # TODO: Does this have to be here, or can it go to meta?
-  homepage = "http://haskell.org/ghc";
-
   src = fetchurl {
-    url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
+    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
+    sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
   };
 
-  buildInputs = [ghc perl gmp ncurses];
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
   configureFlags=[
@@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    inherit homepage;
+    homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
     ];
     platforms = ghc.meta.platforms;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bc9869e822..3eaa4382c25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2233,7 +2233,8 @@ let
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   haskellPackages_ghcHEAD =
     haskellPackagesFun ../development/compilers/ghc/head.nix
-      ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio;
+      (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
+      (x : x.ghcHEADPrefs) false false lowPrio;
 
   haxeDist = import ../development/compilers/haxe {
     inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 03d014569f9..0217a343ea5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -89,8 +89,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ghc703Prefs  = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
   ghc704Prefs  = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
   ghc721Prefs  = super : super // super.haskellPlatformDefaults_future super;
-  ghc722Prefs  = super : super // super.haskellPlatformDefaults_future super;
-  ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link
+  ghc722Prefs  = super : super // super.haskellPlatformDefaults_future super; #link
+  ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
 
   # GHC and its wrapper
   #
@@ -142,9 +142,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     HUnit        = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
     network      = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
     OpenGL       = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
-    parallel     = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
+    parallel     = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok
     parsec       = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
-    QuickCheck   = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok
+    QuickCheck   = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok
     regexBase    = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
     regexCompat  = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
     regexPosix   = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
@@ -169,6 +169,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
     };
 
+  haskellPlatformDefaults_HEAD =
+    self : self.haskellPlatformDefaults_future self // {
+      deepseq = null; # apparently a core library in ghc-7.3
+    };
+
   haskellPlatformArgs_2011_2_0_1 = self : {
     inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;