File tree Expand file tree Collapse file tree 8 files changed +11
-69
lines changed Expand file tree Collapse file tree 8 files changed +11
-69
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ variables:
16
16
- GHC_VERSION : 8.10.7
17
17
CABAL_PROJECT : cabal.project
18
18
- GHC_VERSION : 9.0.2
19
- CABAL_PROJECT : cabal-ghc90 .project
19
+ CABAL_PROJECT : cabal.project
20
20
- GHC_VERSION : 9.2.2
21
21
CABAL_PROJECT : cabal-ghc92.project
22
22
- GHC_VERSION : 9.2.1
Original file line number Diff line number Diff line change 1
1
8.6.5,cabal.project
2
2
8.8.4,cabal.project
3
3
8.10.7,cabal.project
4
- 9.0.2,cabal-ghc90 .project
4
+ 9.0.2,cabal.project
5
5
9.2.1,cabal-ghc92.project
6
6
9.2.2,cabal-ghc92.project
Original file line number Diff line number Diff line change 1
1
8.10.7,cabal.project
2
- 9.0.2,cabal-ghc90 .project
2
+ 9.0.2,cabal.project
Original file line number Diff line number Diff line change 1
1
8.10.7,cabal.project
2
- 9.0.2,cabal-ghc90 .project
2
+ 9.0.2,cabal.project
3
3
9.2.2,cabal-ghc92.project
4
4
9.2.1,cabal-ghc92.project
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -52,6 +52,6 @@ constraints:
52
52
hlint +ghc-lib
53
53
54
54
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,
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ cabal update && cabal install :pkg:haskell-language-server
174
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
175
176
176
``` bash
177
- cabal update && cabal install : pkg:haskell-language-server --project-file=cabal-ghc90.project
177
+ cabal update && cabal install pkg:haskell-language-server
178
178
```
179
179
180
180
Or with ` stack ` :
@@ -192,7 +192,7 @@ ghcup compile hls -v 1.6.1.0 --ghc 8.10.7
192
192
as it uses cabal underneath you might need to use a specific cabal.project for some ghc versions:
193
193
194
194
``` 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
196
196
```
197
197
198
198
### Preprocessors
Original file line number Diff line number Diff line change 336
336
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project" ;
337
337
haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project" ;
338
338
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" ;
340
340
haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project" ;
341
341
} ;
342
342
345
345
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project" ;
346
346
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project" ;
347
347
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" ;
349
349
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project" ;
350
350
} ;
351
351
You can’t perform that action at this time.
0 commit comments