Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix

pkgs/development/compilers/ghc/head.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
 
 let
 
@@ -18,18 +18,22 @@ in
 stdenv.mkDerivation rec {
   version = "7.11.20150118";
   name = "ghc-${version}";
+  rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4";
 
-  src = fetchurl {
-    url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2";
-    sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20";
+  src = fetchgit {
+    url = "git://git.haskell.org/ghc.git";
+    inherit rev;
+    sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6";
   };
 
   postUnpack = ''
-    # tarball includes many already-compiled files
-    find . \( -name '*.dyn_o' -o -name '*.dyn_hi' -o -name haddock \) -type f -exec rm {} \;
+    pushd ghc-${builtins.substring 0 7 rev}
+    patchShebangs .
+    ./boot
+    popd
   '';
 
-  buildInputs = [ ghc perl ];
+  buildInputs = [ ghc perl autoconf automake happy alex ];
 
   preConfigure = ''
     echo >mk/build.mk "${buildMK}"