From bf272b3c8f96dd5b2ead21c9736947197fd33568 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 31 May 2019 12:21:11 -0400 Subject: [PATCH] Update ghcjs for ghc#15481 fix Adds a fix for a bad th issue seen in the wild in: - https://github.com/goldfirere/th-desugar/issues/119 - https://github.com/glguy/th-abstraction/issues/53 Upstream pr: https://github.com/ghcjs/ghcjs/pull/753 --- default.nix | 6 +++--- haskell-overlays/ghcjs.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index ccb5a6e02..690e6dafb 100644 --- a/default.nix +++ b/default.nix @@ -175,9 +175,9 @@ let iosSupport = system == "x86_64-darwin"; ghcjs8_4 = (makeRecursivelyOverridable (nixpkgs.haskell.packages.ghcjs84.override (old: { ghc = old.ghc.override { ghcjsSrc = fetchgit { - url = "https://github.com/obsidiansystems/ghcjs.git"; - rev = "584eaa138c32c5debb3aae571c4153d537ff58f1"; - sha256 = "1ib0vsv2wrwf5iivnq6jw2l9g5izs0fjpp80jrd71qyywx4xcm66"; + url = "https://github.com/matthewbauer/ghcjs.git"; + rev = "0cf07786a7cbe49ded48231785b08c9101345908"; + sha256 = "0isj751nf5h6lk6bwnrm790zgc7bdbxwmnwhz32ldk9npnz9bw44"; fetchSubmodules = true; }; }; diff --git a/haskell-overlays/ghcjs.nix b/haskell-overlays/ghcjs.nix index cc1bdab5c..d5528792f 100644 --- a/haskell-overlays/ghcjs.nix +++ b/haskell-overlays/ghcjs.nix @@ -38,7 +38,6 @@ self: super: { url = "https://github.com/ghcjs/ghcjs-base/commit/0cf64df77cdd6275d86ec6276fcf947fa58e548b.patch"; #ghcjs-base/122 sha256 = "16wdghfsrzrb1y7lscbf9aawgxi3kvbgdjwvl1ga2zzm4mq139dr"; }} - cat ghcjs-base.cabal ) ''; };