From 6faaca2044b4ae2f5f4c8e07246b768574aadcef Mon Sep 17 00:00:00 2001 From: kokobd Date: Mon, 11 Jul 2022 13:50:50 +0800 Subject: [PATCH 1/2] use a modified version of ghc-check --- cabal.project | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cabal.project b/cabal.project index 62dc214f28..8e1cac892f 100644 --- a/cabal.project +++ b/cabal.project @@ -62,6 +62,12 @@ source-repository-package tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460 -- https://github.com/tibbe/ekg-json/pull/12 +-- TODO: remove me when the fix is merged upstream +source-repository-package + type: git + location: https://github.com/kokobd/ghc-check.git + tag: 3522cc27cb4582bea1656581cc863d80de770dce + allow-newer: -- ghc-9.2 ---------- From 1004209479bd568378e9bf0c923da2e651aca72a Mon Sep 17 00:00:00 2001 From: kokobd Date: Mon, 15 Aug 2022 16:07:14 +0800 Subject: [PATCH 2/2] bump ghc-check version --- cabal.project | 8 +------- ghcide/ghcide.cabal | 2 +- stack-lts16.yaml | 2 +- stack-lts19.yaml | 2 +- stack.yaml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cabal.project b/cabal.project index 90fbdf048a..8bfcb20265 100644 --- a/cabal.project +++ b/cabal.project @@ -45,7 +45,7 @@ package * write-ghc-environment-files: never -index-state: 2022-08-09T13:13:41Z +index-state: 2022-08-15T06:53:13Z constraints: hyphenation +embed, @@ -64,12 +64,6 @@ source-repository-package tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460 -- https://github.com/tibbe/ekg-json/pull/12 --- TODO: remove me when the fix is merged upstream -source-repository-package - type: git - location: https://github.com/kokobd/ghc-check.git - tag: 3522cc27cb4582bea1656581cc863d80de770dce - allow-newer: -- ghc-9.2 ---------- diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 7d037dcc38..c1a62f679b 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -108,7 +108,7 @@ library ghc-boot-th, ghc-boot, ghc >= 8.6, - ghc-check >=0.5.0.4, + ghc-check >=0.5.0.8, ghc-paths, cryptohash-sha1 >=0.11.100 && <0.12, hie-bios ^>= 0.9.1, diff --git a/stack-lts16.yaml b/stack-lts16.yaml index 5460e8940f..bbc53ea853 100644 --- a/stack-lts16.yaml +++ b/stack-lts16.yaml @@ -48,7 +48,7 @@ extra-deps: - extra-1.7.10 - floskell-0.10.4 - fourmolu-0.3.0.0 - - ghc-check-0.5.0.4 + - ghc-check-0.5.0.8 - ghc-exactprint-0.6.4 - ghc-lib-8.10.7.20210828 - ghc-lib-parser-8.10.7.20210828 diff --git a/stack-lts19.yaml b/stack-lts19.yaml index 219dc7e820..3c9bd98508 100644 --- a/stack-lts19.yaml +++ b/stack-lts19.yaml @@ -1,4 +1,4 @@ -resolver: lts-19.18 +resolver: lts-19.19 packages: - . diff --git a/stack.yaml b/stack.yaml index 6ea299746c..923990c885 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2022-08-04 +resolver: nightly-2022-08-15 packages: - .