Skip to content

Commit 0ea92c7

Browse files
committed
Get rid of cabal-ghc90.project
1 parent 2bd9ab4 commit 0ea92c7

File tree

8 files changed

+11
-69
lines changed

8 files changed

+11
-69
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variables:
1616
- GHC_VERSION: 8.10.7
1717
CABAL_PROJECT: cabal.project
1818
- GHC_VERSION: 9.0.2
19-
CABAL_PROJECT: cabal-ghc90.project
19+
CABAL_PROJECT: cabal.project
2020
- GHC_VERSION: 9.2.2
2121
CABAL_PROJECT: cabal-ghc92.project
2222
- GHC_VERSION: 9.2.1

bindist/ghcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
8.6.5,cabal.project
22
8.8.4,cabal.project
33
8.10.7,cabal.project
4-
9.0.2,cabal-ghc90.project
4+
9.0.2,cabal.project
55
9.2.1,cabal-ghc92.project
66
9.2.2,cabal-ghc92.project

bindist/ghcs-FreeBSD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
8.10.7,cabal.project
2-
9.0.2,cabal-ghc90.project
2+
9.0.2,cabal.project

bindist/ghcs-Msys

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
8.10.7,cabal.project
2-
9.0.2,cabal-ghc90.project
2+
9.0.2,cabal.project
33
9.2.2,cabal-ghc92.project
44
9.2.1,cabal-ghc92.project

cabal-ghc90.project

Lines changed: 0 additions & 58 deletions
This file was deleted.

cabal.project

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ constraints:
5252
hlint +ghc-lib
5353

5454
allow-newer:
55-
-- for shake-bench
56-
Chart-diagrams:diagrams-core,
57-
SVGFonts:diagrams-core
55+
stylish-haskell:Cabal,
56+
stylish-haskell:ghc-lib-parser,
57+
stylish-haskell:aeson,

docs/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ cabal update && cabal install :pkg:haskell-language-server
174174
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:
175175

176176
```bash
177-
cabal update && cabal install :pkg:haskell-language-server --project-file=cabal-ghc90.project
177+
cabal update && cabal install pkg:haskell-language-server
178178
```
179179

180180
Or with `stack`:
@@ -192,7 +192,7 @@ ghcup compile hls -v 1.6.1.0 --ghc 8.10.7
192192
as it uses cabal underneath you might need to use a specific cabal.project for some ghc versions:
193193

194194
```bash
195-
ghcup compile hls -v 1.6.1.0 --ghc 9.0.2 --cabal-project cabal-ghc90.project
195+
ghcup compile hls -v 1.6.1.0 --ghc 9.0.2
196196
```
197197

198198
### Preprocessors

flake.nix

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

@@ -345,7 +345,7 @@
345345
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
346346
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
347347
haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
348-
haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project";
348+
haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal.project";
349349
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
350350
};
351351

0 commit comments

Comments
 (0)