Skip to content

Commit 9b491f7

Browse files
pepeiborrajneira
andauthored
Drop compatibility with GHC 8.6.5 (#3101)
* Drop compatibility with GHC 8.6.5 * drop a few more bits * fixup merge Co-authored-by: Javier Neira <atreyu.bbb@gmail.com>
1 parent 07f14e3 commit 9b491f7

File tree

10 files changed

+3
-17
lines changed

10 files changed

+3
-17
lines changed

.github/workflows/caching.yml

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
, "9.0.2"
8686
, "8.10.7"
8787
, "8.8.4"
88-
, "8.6.5"
8988
]
9089
os: [ "ubuntu-latest"
9190
, "macOS-latest"

.github/workflows/flags.yml

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
, "9.0.2"
4949
, "8.10.7"
5050
, "8.8.4"
51-
, "8.6.5"
5251
]
5352
os: [ "ubuntu-latest"
5453
]

.github/workflows/hackage.yml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
ghc: [ "9.0.2"
4242
, "8.10.7"
4343
, "8.8.4"
44-
, "8.6.5"
4544
]
4645
exclude:
4746
- ghc: "9.0.2"

.github/workflows/test.yml

-7
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ jobs:
6464
, "9.0.2"
6565
, "8.10.7"
6666
, "8.8.4"
67-
, "8.6.5"
6867
]
6968
os: [ "ubuntu-latest"
7069
, "macOS-latest"
@@ -86,9 +85,6 @@ jobs:
8685
- os: ubuntu-latest
8786
ghc: '8.8.4'
8887
test: true
89-
- os: ubuntu-latest
90-
ghc: '8.6.5'
91-
test: true
9288
- os: windows-latest
9389
ghc: '9.4.2'
9490
test: true
@@ -101,9 +97,6 @@ jobs:
10197
- os: windows-latest
10298
ghc: '8.10.7'
10399
test: true
104-
- os: windows-latest
105-
ghc: '8.6.5'
106-
test: true
107100
# only build rest of supported ghc versions for windows
108101
- os: windows-latest
109102
ghc: '8.8.4'

.gitpod.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ RUN sudo install-packages build-essential curl libffi-dev libffi7 libgmp-dev lib
77
echo 'export PATH=$HOME/.cabal/bin:$HOME/.local/bin:$PATH' >> $HOME/.bashrc && \
88
. /home/gitpod/.ghcup/env && \
99
# Install all verions of GHC that HLS supports. Putting GHC into Docker image makes workspace start much faster.
10-
ghcup install ghc 8.6.5 && \
1110
ghcup install ghc 8.8.4 && \
1211
ghcup install ghc 8.10.7 && \
1312
ghcup install ghc 9.0.2 && \

bindist/ghcs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
8.6.5,cabal.project
21
8.8.4,cabal.project
32
8.10.7,cabal.project
43
9.0.2,cabal.project

docs/support/ghc-version-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Support status (see the support policy below for more details):
3232
| 8.8.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support, will be deprecated after LTS and HLS full support for ghc-9.2 |
3333
| 8.8.3 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1) | deprecated |
3434
| 8.8.2 | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0) | deprecated |
35-
| 8.6.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support, will be deprecated after LTS and HLS full suppot for ghc-9.2 |
35+
| 8.6.5 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
3636
| 8.6.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
3737

3838
GHC versions not in the list have never been supported by HLS.

ghcide/ghcide.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description:
1313
A library for building Haskell IDE's on top of the GHC API.
1414
homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
1515
bug-reports: https://github.com/haskell/haskell-language-server/issues
16-
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
16+
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
1717
extra-source-files: README.md CHANGELOG.md
1818
test/data/**/*.project
1919
test/data/**/*.cabal

haskell-language-server.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
1414
license: Apache-2.0
1515
license-file: LICENSE
1616
build-type: Simple
17-
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
17+
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

hls-graph/src/Development/IDE/Graph/Internal/Types.hs

-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ module Development.IDE.Graph.Internal.Types where
1313
import Control.Applicative
1414
import Control.Monad.Catch
1515
#if __GLASGOW_HASKELL__ < 808
16-
-- Needed in GHC 8.6.5
1716
import Control.Concurrent.STM.Stats (TVar, atomically)
18-
import Control.Monad.Fail
1917
#else
2018
import GHC.Conc (TVar, atomically)
2119
#endif

0 commit comments

Comments
 (0)