diff options
| author | Peter Simons <simons@cryp.to> | 2016-12-23 10:27:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 10:27:49 +0100 |
| commit | 53bc16ad306ccfd0b07c0f3d15caedccc61753b4 (patch) | |
| tree | 78f1b1e9a4b9d8dccbc9f92914ebeb02bbf4b5fc /pkgs/development/compilers/ghc | |
| parent | 06f51e17fa324511a36ef6ad40a9a0f88f5d1732 (diff) | |
| parent | d8a8e1cd0a358fba75ef7b323d97561b5a26eed0 (diff) | |
| download | nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar.gz nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar.bz2 nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar.lz nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar.xz nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.tar.zst nixlib-53bc16ad306ccfd0b07c0f3d15caedccc61753b4.zip | |
Merge pull request #21369 from mpickering/master
Update GHC 8.0.2 to RC 2
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 9b8645fc1dbd..977a0fb39b6f 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -13,21 +13,15 @@ let }); in stdenv.mkDerivation rec { - version = "8.0.1.20161117"; + version = "8.0.1.20161213"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz"; - sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874"; + url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz"; + sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529"; }; - patches = [ - # 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; + patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; buildInputs = [ ghc perl hscolour ]; |