diff options
| author | Peter Simons <simons@cryp.to> | 2019-06-14 17:20:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 17:20:50 +0200 |
| commit | 61508b5d92d71a9e397f27684fd02712c31df32a (patch) | |
| tree | 2f3fc264485857cf7c3abfc3bf1db1f43473f6f8 /pkgs/development/compilers | |
| parent | d9d29d9115b0cc2e901bf261853e7c51340f4d17 (diff) | |
| parent | c382915e2817c694a1eee4fc60d9562c972b9f15 (diff) | |
| download | nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar.gz nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar.bz2 nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar.lz nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar.xz nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.tar.zst nixpkgs-61508b5d92d71a9e397f27684fd02712c31df32a.zip | |
Merge pull request #63001 from Infinisil/update/ghcHEAD
haskell.compiler.ghcHEAD: 20190115 -> 20190601
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b263b8b187d..14151601542 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,7 +27,7 @@ , # Whetherto build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.7.20190115" +, version ? "8.9.20190601" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -89,14 +89,24 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65"; - sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834"; + rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204"; + sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; + patches = [ + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. |