Skip to content

Commit 13783b9

Browse files
committed
clean up references to cabal-ghc92.project and other stale docs
1 parent 912b1cf commit 13783b9

File tree

6 files changed

+10
-22
lines changed

6 files changed

+10
-22
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ variables:
1818
- GHC_VERSION: 9.0.2
1919
CABAL_PROJECT: cabal.project
2020
- GHC_VERSION: 9.2.2
21-
CABAL_PROJECT: cabal-ghc92.project
21+
CABAL_PROJECT: cabal.project
2222
- GHC_VERSION: 9.2.1
23-
CABAL_PROJECT: cabal-ghc92.project
23+
CABAL_PROJECT: cabal.project
2424

2525
workflow:
2626
rules:

bindist/ghcs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
8.8.4,cabal.project
33
8.10.7,cabal.project
44
9.0.2,cabal.project
5-
9.2.1,cabal-ghc92.project
6-
9.2.2,cabal-ghc92.project
5+
9.2.1,cabal.project
6+
9.2.2,cabal.project

bindist/ghcs-Msys

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
8.10.7,cabal.project
22
9.0.2,cabal.project
3-
9.2.2,cabal-ghc92.project
4-
9.2.1,cabal-ghc92.project
3+
9.2.2,cabal.project
4+
9.2.1,cabal.project

docs/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ghcup compile hls -v 1.6.1.0 --ghc 8.10.7 --ghc 8.8.4
3636

3737
Use a different `cabal.project` for a GHC version:
3838
```
39-
ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal-ghc92.project
39+
ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal.project
4040
```
4141

4242
Check `ghcup compile hls --help` for a full list of compilation options.

docs/troubleshooting.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,10 @@ The easiest way to obtain a dynamically linked HLS binary is to build HLS locall
171171
cabal update && cabal install :pkg:haskell-language-server
172172
```
173173

174-
If you are compiling with a ghc version with a specific `cabal-ghc${ghcVersion}.project` in the repo you will have to use it. For example for ghc-9.0.x:
175-
176-
```bash
177-
cabal update && cabal install pkg:haskell-language-server
178-
```
179-
180174
Or with `stack`:
181175

182176
```bash
183-
stack install haskell-language-server --stack-yaml=stack-${ghcVersion}.yaml
177+
stack install haskell-language-server
184178
```
185179

186180
You also can leverage `ghcup compile hls`:
@@ -189,12 +183,6 @@ You also can leverage `ghcup compile hls`:
189183
ghcup compile hls -v 1.6.1.0 --ghc 8.10.7
190184
```
191185

192-
as it uses cabal underneath you might need to use a specific cabal.project for some ghc versions:
193-
194-
```bash
195-
ghcup compile hls -v 1.6.1.0 --ghc 9.0.2
196-
```
197-
198186
### Preprocessors
199187

200188
HLS is [not yet](https://github.com/haskell/haskell-language-server/issues/176) able to find project preprocessors, which may result in `could not execute: <preprocessor>` errors.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
338338
haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
339339
haskell-language-server-901-dev = mkDevShell ghc901 "cabal.project";
340-
haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project";
340+
haskell-language-server-921-dev = mkDevShell ghc921 "cabal.project";
341341
};
342342

343343
# Developement shell, haskell packages are also provided by nix
@@ -346,7 +346,7 @@
346346
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
347347
haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
348348
haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal.project";
349-
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
349+
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal.project";
350350
};
351351

352352
allPackages = {

0 commit comments

Comments
 (0)