From 0cbb65c832f708e1986c0d1145c5aa457018393c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 27 Jan 2017 01:45:50 +0100 Subject: [PATCH] ghcjs-HEAD: upgrade to the latest HEAD It includes the following changes: * Fixed crash on Safari on iOS * Make linker write externs for closure compiler ADVANCED_OPTIMIZATIONS * ghcjs-pkg fixes for ghc 8.0.2 Because of the latter I switched from GHC-8.0.1 to GHC-8.0.2 to build ghcjs-HEAD. --- pkgs/development/compilers/ghcjs/head.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index b191f9655d2..1c347655ebe 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -10,8 +10,8 @@ bootPkgs.callPackage ./base.nix { ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; - rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; - sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; + rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; + sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; }; ghcjsBootSrc = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7309121486e..805e9560c20 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -61,8 +61,8 @@ rec { ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; }; - ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix { - bootPkgs = packages.ghc801; + ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + bootPkgs = packages.ghc802; }; jhc = callPackage ../development/compilers/jhc {