mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
Merge pull request #21369 from mpickering/master
Update GHC 8.0.2 to RC 2
This commit is contained in:
commit
53bc16ad30
|
@ -13,21 +13,15 @@ let
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "8.0.1.20161117";
|
version = "8.0.1.20161213";
|
||||||
name = "ghc-${version}";
|
name = "ghc-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz";
|
url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz";
|
||||||
sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874";
|
sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
|
||||||
# Already applied?
|
|
||||||
# ./relocation.patch
|
|
||||||
# Fix https://ghc.haskell.org/trac/ghc/ticket/12130
|
|
||||||
# (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
|
|
||||||
(fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
|
|
||||||
] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
|
|
||||||
|
|
||||||
buildInputs = [ ghc perl hscolour ];
|
buildInputs = [ ghc perl hscolour ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue