Skip to content

Commit 55ea102

Browse files
committed
Remove references to cabal-ghc921.project
It has been changed to `cabal-ghc92.project`
1 parent 41b30b5 commit 55ea102

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/actions/setup-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ runs:
4242
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
4343
shell: bash
4444

45-
# This copy an alternative cabal-ghc${GHCVER}.project (for example cabal-ghc921.project)
45+
# This copy an alternative cabal-ghc${GHCVER}.project (for example cabal-ghc92.project)
4646
# as main cabal-project, for not fully supported ghc versions
4747
# Needs to be before the caching step so that the cache can detect changes to the modified cabal.project file
4848
- name: Use possible modified `cabal.project`

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variables:
2020
- GHC_VERSION: 9.0.2
2121
CABAL_PROJECT: cabal-ghc90.project
2222
- GHC_VERSION: 9.2.2
23-
CABAL_PROJECT: cabal-ghc921.project
23+
CABAL_PROJECT: cabal-ghc92.project
2424

2525
workflow:
2626
rules:

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-ghc921.project
39+
ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal-ghc92.project
4040
```
4141

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

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-ghc90.project";
340-
haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc921.project";
340+
haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.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-ghc90.project";
349-
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc921.project";
349+
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
350350
};
351351

352352
allPackages = {

0 commit comments

Comments
 (0)