update GHC HEAD and configuration
This commit is contained in:
parent
c3d9e90f0e
commit
b9de32de5b
|
@ -17,14 +17,14 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.11.20150402";
|
||||
version = "7.11.20150607";
|
||||
name = "ghc-${version}";
|
||||
rev = "47f821a1a24553dc29b9581b1a259a9b1394c955";
|
||||
rev = "89223ce1340654455a9f3aa9cbf25f30884227fd";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.haskell.org/ghc.git";
|
||||
inherit rev;
|
||||
sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj";
|
||||
sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
@ -42,10 +42,31 @@ self: super: {
|
|||
|
||||
# haddock: No input file(s).
|
||||
nats = dontHaddock super.nats;
|
||||
bytestring-builder = dontHaddock super.bytestring-builder;
|
||||
|
||||
alex = dontCheck super.alex;
|
||||
|
||||
# We have time 1.5
|
||||
aeson = disableCabalFlag super.aeson "old-locale";
|
||||
|
||||
# Show works differently for record syntax now, breaking haskell-src-exts' parser tests
|
||||
# https://github.com/haskell-suite/haskell-src-exts/issues/224
|
||||
haskell-src-exts = dontCheck super.haskell-src-exts;
|
||||
|
||||
process-extras = appendPatch super.process-extras (pkgs.fetchpatch {
|
||||
url = "https://github.com/seereason/process-extras/pull/4.patch";
|
||||
sha256 = "0wfd8dmr0a4dvgp6nhmkznxq1nq8ciprsacn1canmkzjkdidn6kj";
|
||||
});
|
||||
mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
|
||||
url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
|
||||
sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
|
||||
});
|
||||
yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
|
||||
url = "https://github.com/yesodweb/yesod/pull/1006.patch";
|
||||
sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# Setup: At least the following dependencies are missing: base <4.8
|
||||
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
|
||||
patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
|
||||
|
|
Loading…
Reference in a new issue