Skip to content

Commit

Permalink
Update ghcjs for ghc#15481 fix
Browse files Browse the repository at this point in the history
Adds a fix for a bad th issue seen in the wild in:

- goldfirere/th-desugar#119
- glguy/th-abstraction#53

Upstream pr: ghcjs/ghcjs#753
  • Loading branch information
matthewbauer committed May 31, 2019
1 parent 2389468 commit bf272b3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};
Expand Down
1 change: 0 additions & 1 deletion haskell-overlays/ghcjs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
'';
};
Expand Down

0 comments on commit bf272b3

Please sign in to comment.