From 599d594f5a19d88f78ef736aca307fade9a602a1 Mon Sep 17 00:00:00 2001 From: Shao Cheng Date: Wed, 4 Sep 2019 12:39:02 +0800 Subject: [PATCH] Bump deps & provide more ghc bindist variants in stack.yaml --- docs/custom-ghc.md | 5 ++--- stack.yaml | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docs/custom-ghc.md b/docs/custom-ghc.md index 57ad81b6..a42b2494 100644 --- a/docs/custom-ghc.md +++ b/docs/custom-ghc.md @@ -14,9 +14,8 @@ of the upstream release commit for our modifications: [D5082](https://phabricator.haskell.org/D5082) for configurable integer library and tables-next-to-code in `DynFlags`. * Implement additional - [`Hooks`](https://github.com/TerrorJack/ghc/blob/asterius-8.6/compiler/main/Hooks.hs): - `tcRnModuleHook`, `stgCmmHook`, `cmmToRawCmmHook` for accessing in-memory GHC - IRs. + [`Hooks`](https://github.com/TerrorJack/ghc/blob/asterius-8.6/compiler/main/Hooks.hs). +* Various modifications due to changed type signatures in the hooked functions. * Link `ghc-pkg`/`hsc2hs` with `-threaded`. See the [`circleci-ghc-8.6`](circleci-ghc-8.6) branch of `asterius` repo for CI diff --git a/stack.yaml b/stack.yaml index 889cdc91..fe4621d9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.3 +resolver: lts-14.4 packages: - asterius - binaryen @@ -11,9 +11,17 @@ setup-info: ghc: linux64-tinfo6: 8.6.5: - url: https://6507-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-unknown-linux.tar.xz - sha256: 3243867786e5920ceb9f42f12a8e7270293097018ed5d32b7c8559551146e442 + url: https://6575-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-unknown-linux.tar.xz + sha256: a0ebc4ef111fe4d12a24448e01abedc4975d339d685c4cb572cef6f055762f2d + linux64: + 8.6.5: + url: https://6577-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-unknown-linux.tar.xz + sha256: 10d9bf87cf876ad8ea360dbe0071fa32cf60dded9d6695cda91c418cefc8256f + linux64-musl: + 8.6.5: + url: https://6576-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-alpine-linux.tar.xz + sha256: 862f92489691607edf319102b7c533dd6b18d84929fa0551a05e5336966f9f1d macosx: 8.6.5: - url: https://6508-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-apple-darwin.tar.xz - sha256: c1615bcc78443f1fe466fb44b685850341e25a7aad405b31f930014cbf981870 + url: https://6578-111412813-gh.circle-artifacts.com/0/tmp/ghc-bindist/ghc-8.6.5-x86_64-apple-darwin.tar.xz + sha256: d743e30ded14b02a4e0cb123a94f663b8096b34af5f4d82ed4a13924718344f9