git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #63001 from Infinisil/update/ghcHEAD

haskell.compiler.ghcHEAD: 20190115 -> 20190601

commit61508b5d92d71a9e397f27684fd02712c31df32a authorPeter Simons <simons@cryp.to> dateFri 14 Jun 2019, 17:20 (7 years ago) parentd9d29d9c382915
1 file changed+13−3
pkgs/development/compilers/ghc/head.nix+13−3
pkgs/development/compilers/ghc/head.nix+13−3
@@ -27,7 +27,7 @@
2727, # Whetherto build terminfo.
2828 enableTerminfo ? !stdenv.targetPlatform.isWindows
2929
30−, version ? "8.7.20190115"
30+, version ? "8.9.20190601"
3131, # What flavour to build. An empty string indicates no
3232 # specific flavour and falls back to ghc default values.
3333 ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,14 +89,24 @@ stdenv.mkDerivation (rec {
8989
9090 src = fetchgit {
9191 url = "https://gitlab.haskell.org/ghc/ghc.git/";
92− rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
93− sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
92+ rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
93+ sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
9494 };
9595
9696 enableParallelBuilding = true;
9797
9898 outputs = [ "out" "doc" ];
9999
100+ patches = [
101+ (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
102+ url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
103+ name = "loadpluginsinmodules.diff";
104+ sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
105+ extraPrefix = "utils/haddock/";
106+ stripLen = 1;
107+ })
108+ ];
109+
100110 postPatch = "patchShebangs .";
101111
102112 # GHC is a bit confused on its cross terminology.