diff options
| author | Shea Levy <shea@shealevy.com> | 2017-01-06 08:39:12 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-01-06 08:39:12 -0500 |
| commit | 3c2cbd3259926a595a82fe502417b85e931002a1 (patch) | |
| tree | 03af58d9983dcd7a2b8bc921d8f01646faa639bc /pkgs/development/compilers/ghc | |
| parent | 39bb4fe0ee05b94d8dbdec311ef605853d230727 (diff) | |
| download | nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar.gz nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar.bz2 nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar.lz nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar.xz nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.tar.zst nixlib-3c2cbd3259926a595a82fe502417b85e931002a1.zip | |
ghc-head: bump
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0581038d18df..081f554e06bf 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20161224"; + version = "8.1.20170106"; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -19,12 +19,12 @@ let in stdenv.mkDerivation (rec { inherit version; name = "ghc-${version}"; - rev = "2689a1692636521777f007861a484e7064b2d696"; + rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr"; + sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0"; }; postPatch = "patchShebangs ."; @@ -86,9 +86,6 @@ in stdenv.mkDerivation (rec { } // stdenv.lib.optionalAttrs (cross != null) { name = "${cross.config}-ghc-${version}"; - # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713) - patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ]; - preConfigure = commonPreConfigure + '' sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk ''; |