Merge pull request #36475 from deepfire/ghc-8.4

ghc841:  bump to 8.4.1-release
This commit is contained in:
Peter Simons 2018-03-09 08:47:10 +01:00 committed by GitHub
commit 9a9eb3e16b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple , # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library. # library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null enableIntegerSimple ? false, gmp ? null, m4
, # If enabled, use -fPIC when compiling static libs. , # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -24,7 +24,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? true enableShared ? true
, version ? "8.4.0.20180224" , version ? "8.4.1"
, # Whether to backport https://phabricator.haskell.org/D4388 for , # Whether to backport https://phabricator.haskell.org/D4388 for
# deterministic profiling symbol names, at the cost of a slightly # deterministic profiling symbol names, at the cost of a slightly
# non-standard GHC API # non-standard GHC API
@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6"; rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb";
sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893"; sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
# masss-rebuild. # masss-rebuild.
crossConfig = true; crossConfig = true;
nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
# For building runtime libs # For building runtime libs
depsBuildTarget = toolsForTarget; depsBuildTarget = toolsForTarget;