From 6c8e8477f63aec5be88466e9291bb71c3fc97a84 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 2 May 2020 14:10:38 +0100 Subject: [PATCH 1/3] Bump resolvers cabal to 2020-05-02T10:11:15Z stack-8.8.3 to lts-15.10 stack to nightly-2020-05-01 --- cabal.project | 2 +- stack-8.8.3.yaml | 8 ++++---- stack.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cabal.project b/cabal.project index d23dce89..4b7d2226 100644 --- a/cabal.project +++ b/cabal.project @@ -21,4 +21,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-04-06T20:27:36Z +index-state: 2020-05-02T10:11:15Z \ No newline at end of file diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 2f11c383..ad6ba871 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -1,4 +1,4 @@ -resolver: lts-15.4 +resolver: lts-15.10 packages: - . - hie-plugin-api @@ -14,11 +14,11 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- haddock-api-2.23.1 -- hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 +- haddock-api-2.23.1 +- hoogle-5.0.17.15 +- hsimport-0.11.0 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - semigroups-0.18.5 diff --git a/stack.yaml b/stack.yaml index 13b12fec..e1fd0152 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-04-09 +resolver: nightly-2020-05-01 packages: - . @@ -8,24 +8,24 @@ extra-deps: # - ./submodules/HaRe - apply-refact-0.7.0.0 -- bytestring-trie-0.2.5.0@sha256:9efa9c6f556314d28486be2470ff789419c5238ed2e354870623a3cbbd28fbe2,3349 +- bytestring-trie-0.2.5.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-8.10.1.20200412 - ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.23.1 - haddock-library-1.8.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 -- lsp-test-0.10.1.0 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0 - ilist-0.3.1.0 +- lsp-test-0.10.1.0 - monad-dijkstra-0.1.1.2 - semigroups-0.18.5 - temporary-1.2.1.1 From 55a82ee3d4c8435b707036263997fd5a08bc0f65 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 2 May 2020 16:59:55 +0100 Subject: [PATCH 2/3] Fix cabal build for GHC 8.8.3 --- haskell-ide-engine.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index c1d2d956..3fed6cc3 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -104,7 +104,7 @@ library , unliftio , hlint >= 2.2.11 if impl(ghc >= 8.6) - build-depends: ormolu >= 0.0.3.1 + build-depends: ormolu == 0.0.3.* ghc-options: -Wall -Wredundant-constraints if flag(pedantic) From 73a9f773349c23580d14f5219d11010dce563efc Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 2 May 2020 19:23:27 +0100 Subject: [PATCH 3/3] Sort out ghc-nightly build --- stack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index e1fd0152..5a28c036 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- ghc-lib-parser-8.10.1.20200412 +- ghc-lib-parser-8.8.3.20200412.1 - ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.23.1 - haddock-library-1.8.0 @@ -27,6 +27,7 @@ extra-deps: - ilist-0.3.1.0 - lsp-test-0.10.1.0 - monad-dijkstra-0.1.1.2 +- ormolu-0.0.3.1 - semigroups-0.18.5 - temporary-1.2.1.1 - unliftio-core-0.2.0.1