diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-13 22:17:12 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-13 22:17:12 +0100 |
| commit | 600135bba506ae93bf418cc484b3d9953a37f9de (patch) | |
| tree | 5c0a8fabe2b1964c370d659b477685600095e521 /pkgs/development/compilers/ghc/head.nix | |
| parent | 7a1d132db9508d9831766da5b012d3d55e8c37c1 (diff) | |
| parent | 54ce1a1810454aa24381d6c8370e48706ee48312 (diff) | |
| download | nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar.gz nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar.bz2 nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar.lz nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar.xz nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.tar.zst nixlib-600135bba506ae93bf418cc484b3d9953a37f9de.zip | |
Merge remote-tracking branch 'master' into staging.
Diffstat (limited to 'pkgs/development/compilers/ghc/head.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ebb3ac85bb9..0363855977f7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/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}" |