From a1a19a89997854222843a07e14520239d942e8ea Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:11:23 +0000 Subject: [PATCH 1/6] Try to extend CI to 9.2.1 --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 828f12ec8..fcca26756 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.0.1', '8.10.4', '8.8.3', '8.6.5', '8.4.4'] + ghc: ['9.2.1', '9.0.1', '8.10.4', '8.8.3', '8.6.5', '8.4.4'] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: - os: windows-latest From a1d4eeaf84e356558bcc21dc17a51b1d2223d678 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:17:14 +0000 Subject: [PATCH 2/6] Use latest cabal --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index fcca26756..b5ea4c46b 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -20,7 +20,7 @@ jobs: - uses: haskell/actions/setup@v1 with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.4' + cabal-version: 'latest' - name: Cache uses: actions/cache@v1 From a7b5df084468ed4f193e3b61feb09a0563944246 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:18:39 +0000 Subject: [PATCH 3/6] Give more generous bounds on base Also delete bounds on components other than the main library component, they don't do anything. --- lsp-test/lsp-test.cabal | 4 ++-- lsp-types/lsp-types.cabal | 2 +- lsp/lsp.cabal | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal index 2f1a318e0..111b57b3b 100644 --- a/lsp-test/lsp-test.cabal +++ b/lsp-test/lsp-test.cabal @@ -99,7 +99,7 @@ test-suite func-test main-is: FuncTest.hs hs-source-dirs: func-test type: exitcode-stdio-1.0 - build-depends: base <4.16 + build-depends: base , lsp-test , lsp , data-default @@ -124,7 +124,7 @@ benchmark simple-bench main-is: SimpleBench.hs hs-source-dirs: bench type: exitcode-stdio-1.0 - build-depends: base <4.16 + build-depends: base , lsp-test , lsp , process diff --git a/lsp-types/lsp-types.cabal b/lsp-types/lsp-types.cabal index 36a0607c8..4ca08008a 100644 --- a/lsp-types/lsp-types.cabal +++ b/lsp-types/lsp-types.cabal @@ -70,7 +70,7 @@ library , Language.LSP.Types.WorkspaceSymbol -- other-extensions: ghc-options: -Wall - build-depends: base >= 4.11 && < 4.16 + build-depends: base >= 4.11 && < 5 , aeson >=1.2.2.0 , binary , bytestring diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal index 1d0b70024..7cec6d64b 100644 --- a/lsp/lsp.cabal +++ b/lsp/lsp.cabal @@ -31,7 +31,7 @@ library , Language.LSP.Server.Control , Language.LSP.Server.Processing ghc-options: -Wall - build-depends: base >= 4.11 && < 4.16 + build-depends: base >= 4.11 && < 5 , async , aeson >=1.0.0.0 , attoparsec @@ -67,7 +67,7 @@ executable lsp-demo-reactor-server default-language: Haskell2010 ghc-options: -Wall -Wno-unticked-promoted-constructors - build-depends: base >= 4.11 && < 4.16 + build-depends: base , aeson , bytestring , containers @@ -91,7 +91,7 @@ executable lsp-demo-simple-server hs-source-dirs: example default-language: Haskell2010 ghc-options: -Wall -Wno-unticked-promoted-constructors - build-depends: base >= 4.11 && < 5 + build-depends: base -- the package library. Comment this out if you want repl changes to propagate , lsp , text From 5872451afe685ad76120ababd9893ba5c3ad4f49 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:27:07 +0000 Subject: [PATCH 4/6] Delete now-unnecessary source pins --- cabal.project | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cabal.project b/cabal.project index aa854048e..1e21eae5a 100644 --- a/cabal.project +++ b/cabal.project @@ -17,17 +17,3 @@ allow-newer: cryptohash-md5:base, hslogger:base, entropy:Cabal, - --- Required for ghc-9.0.1 support -source-repository-package - type: git - location: https://github.com/anka-213/th-extras - tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659 --- https://github.com/mokus0/th-extras/pull/8 - -source-repository-package - type: git - location: https://github.com/anka-213/dependent-sum - tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5 - subdir: dependent-sum-template --- https://github.com/obsidiansystems/dependent-sum/pull/57 From 824492fea36b1e683ddf7a72d2e25bf72f54cd09 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:30:24 +0000 Subject: [PATCH 5/6] Try relaxing constraints-extras bounds --- cabal.project | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cabal.project b/cabal.project index 1e21eae5a..2a5550bab 100644 --- a/cabal.project +++ b/cabal.project @@ -17,3 +17,5 @@ allow-newer: cryptohash-md5:base, hslogger:base, entropy:Cabal, + constraints-extras:base, + constraints-extras:template-haskell From 322e34c3108df4dfaaedfbef99a347de18744823 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Dec 2021 12:45:13 +0000 Subject: [PATCH 6/6] Try removing some constraints and see if we need them --- cabal.project | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cabal.project b/cabal.project index 2a5550bab..a4aecbae8 100644 --- a/cabal.project +++ b/cabal.project @@ -12,10 +12,5 @@ test-show-details: direct haddock-quickjump: True allow-newer: - lens:template-haskell, - cryptohash-sha1:base, - cryptohash-md5:base, - hslogger:base, - entropy:Cabal, constraints-extras:base, constraints-extras:template-haskell