From 0718c12cc81c6bd6b692574b415d741297b0c58b Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Mon, 2 Mar 2020 22:29:43 +0000 Subject: [PATCH 1/2] Bump resolvers and hlint to 2.2.11 --- cabal.project | 2 +- cabal.project-8.8.2 | 2 +- haskell-ide-engine.cabal | 2 +- stack-8.4.2.yaml | 9 +++++---- stack-8.4.3.yaml | 9 +++++---- stack-8.4.4.yaml | 9 +++++---- stack-8.6.4.yaml | 9 +++++---- stack-8.6.5.yaml | 7 ++++--- stack-8.8.1.yaml | 5 +++-- stack-8.8.2.yaml | 7 ++++--- stack.yaml | 7 ++++--- 11 files changed, 38 insertions(+), 30 deletions(-) diff --git a/cabal.project b/cabal.project index 8499512e2..38c3947e1 100644 --- a/cabal.project +++ b/cabal.project @@ -21,4 +21,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-02-05T07:49:28Z +index-state: 2020-03-02T20:56:02Z \ No newline at end of file diff --git a/cabal.project-8.8.2 b/cabal.project-8.8.2 index e38f8b79e..5c899090d 100644 --- a/cabal.project-8.8.2 +++ b/cabal.project-8.8.2 @@ -29,4 +29,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-02-05T07:49:28Z +index-state: 2020-03-02T20:56:02Z \ No newline at end of file diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index b801f7c2d..248b9557c 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -102,7 +102,7 @@ library , hie-bios >= 0.4 && < 0.5.0 , bytestring-trie , unliftio - , hlint >= 2.2.8 + , hlint >= 2.2.11 if impl(ghc >= 8.6) build-depends: ormolu >= 0.0.3.1 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 32cd8a3a1..cabd203c8 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -19,14 +19,14 @@ extra-deps: - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 -- extra-1.6.18 +- extra-1.6.21 - file-embed-0.0.11 - filepattern-0.1.1 - floskell-0.10.2 - generic-deriving-1.13.1 - ghc-exactprint-0.6.2 # for HaRe -- ghc-lib-parser-8.8.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 @@ -34,7 +34,7 @@ extra-deps: - haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 @@ -55,6 +55,7 @@ extra-deps: - syz-0.2.0.0 - type-equality-1 - unix-compat-0.5.2 +- unliftio-0.2.12 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 - th-abstraction-0.3.1.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 9dbfa3b6f..95c1aed05 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -25,14 +25,14 @@ extra-deps: - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 - dec-0.0.3 -- extra-1.6.18 +- extra-1.6.21 - file-embed-0.0.11.1 - filepattern-0.1.1 - floskell-0.10.2 - generic-deriving-1.13.1 - ghc-exactprint-0.6.2 # for HaRe -- ghc-lib-parser-8.8.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 @@ -40,7 +40,7 @@ extra-deps: - haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 @@ -74,6 +74,7 @@ extra-deps: - topograph-1 - type-equality-1 - unix-compat-0.5.2 +- unliftio-0.2.12 - unordered-containers-0.2.10.0 - vector-0.12.1.2 - yaml-0.11.2.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 41645d97b..8d6ffa54f 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -18,14 +18,14 @@ extra-deps: - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 -- extra-1.6.18 +- extra-1.6.21 - file-embed-0.0.11 - filepattern-0.1.1 - floskell-0.10.2 - generic-deriving-1.13.1 - ghc-exactprint-0.6.2 # for HaRe -- ghc-lib-parser-8.8.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 @@ -33,7 +33,7 @@ extra-deps: - haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 @@ -54,6 +54,7 @@ extra-deps: - socks-0.6.1 # for network and network-bsd - syz-0.2.0.0 - unix-compat-0.5.2 +- unliftio-0.2.12 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 - th-abstraction-0.3.1.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index a9eafff06..ca707f7e0 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -16,17 +16,17 @@ extra-deps: commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 -- extra-1.6.18 +- extra-1.6.21 - floskell-0.10.2 - ghc-exactprint-0.6.2 # for HaRe -- ghc-lib-parser-8.8.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.22.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.21.1 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - lsp-test-0.10.1.0 @@ -40,6 +40,7 @@ extra-deps: - temporary-1.2.1.1 - time-compat-1.9.2.2 - unix-compat-0.5.2 +- unliftio-0.2.12 - unordered-containers-0.2.10.0 - yaml-0.11.2.0 # To make build work in windows 7 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 2f9596bfe..0ca019c97 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -19,15 +19,16 @@ extra-deps: - cabal-plan-0.6.2.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 +- extra-1.6.21 - floskell-0.10.2 - ghc-exactprint-0.6.2 # for HaRe -- ghc-lib-parser-8.8.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.22.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - indexed-profunctors-0.1 diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml index be8253566..f8a9582a0 100644 --- a/stack-8.8.1.yaml +++ b/stack-8.8.1.yaml @@ -15,8 +15,9 @@ extra-deps: commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 - clock-0.7.2 - constrained-dynamic-0.1.0.0 +- extra-1.6.21 - floskell-0.10.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.23.0 - haddock-library-1.8.0 - haskell-lsp-0.20.0.0 @@ -24,7 +25,7 @@ extra-deps: - lsp-test-0.10.1.0 - haskell-src-exts-1.21.1 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - ilist-0.3.1.0 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index fd4ed7b89..d0e8a662d 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-01-31 +resolver: lts-15.2 packages: - . - hie-plugin-api @@ -15,7 +15,8 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 # To avoid build error with ghc-8.8.2 # See https://github.com/haskell/haddock/issues/1123 - git: https://github.com/haskell/haddock.git @@ -29,7 +30,7 @@ extra-deps: - lsp-test-0.10.1.0 - haskell-src-exts-1.21.1 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - ilist-0.3.1.0 diff --git a/stack.yaml b/stack.yaml index da9ba0672..8d7f30ae1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-01-31 +resolver: nightly-2020-03-01 packages: - . - hie-plugin-api @@ -15,7 +15,8 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- ghc-lib-parser-ex-8.8.4.0 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - git: https://github.com/haskell/haddock.git commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 subdirs: @@ -27,7 +28,7 @@ extra-deps: - lsp-test-0.10.1.0 - haskell-src-exts-1.21.1 - hie-bios-0.4.0 -- hlint-2.2.10 +- hlint-2.2.11 - hoogle-5.0.17.11 - hsimport-0.11.0 - ilist-0.3.1.0 From 7538134e8b509b3b008955af135c4115c05a8531 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Tue, 3 Mar 2020 18:58:51 +0000 Subject: [PATCH 2/2] Stick with older unliftio-core There is a breaking change in version 0.2.0.1, see #1680 --- cabal.project | 2 +- cabal.project-8.8.2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 38c3947e1..325e70d66 100644 --- a/cabal.project +++ b/cabal.project @@ -21,4 +21,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-03-02T20:56:02Z \ No newline at end of file +index-state: 2020-03-01T07:49:28Z \ No newline at end of file diff --git a/cabal.project-8.8.2 b/cabal.project-8.8.2 index 5c899090d..d92568a1d 100644 --- a/cabal.project-8.8.2 +++ b/cabal.project-8.8.2 @@ -29,4 +29,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-03-02T20:56:02Z \ No newline at end of file +index-state: 2020-03-01T07:49:28Z