Skip to content

Commit 8804cbd

Browse files
jneirajneira
authored
Post ghc-9.2.1 config cleanup (#2582)
* Uncomment packages thanks to allow-newer * Clean up cabal config files * Enable floskell for ghc-9.2.1 * removing bad flag usage * correct bad merge
1 parent 4ffdf45 commit 8804cbd

File tree

6 files changed

+66
-56
lines changed

6 files changed

+66
-56
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
name: Test hls-brittany-plugin
151151
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
152152

153-
- if: matrix.test && matrix.ghc != '9.2.1'
153+
- if: matrix.test
154154
name: Test hls-floskell-plugin
155155
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
156156

‎cabal-ghc901.project‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,3 @@ allow-newer:
6363

6464
floskell:base,
6565
floskell:ghc-prim,
66-
67-
-- for shake-bench
68-
Chart-diagrams:diagrams-core,
69-
SVGFonts:diagrams-core

‎cabal-ghc921.project‎

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,26 @@ packages:
66
./ghcide
77
./hls-plugin-api
88
./hls-test-utils
9-
-- ./plugins/hls-tactics-plugin
10-
-- ./plugins/hls-brittany-plugin
11-
-- ./plugins/hls-stylish-haskell-plugin
9+
./plugins/hls-tactics-plugin
10+
./plugins/hls-brittany-plugin
11+
./plugins/hls-stylish-haskell-plugin
1212
./plugins/hls-fourmolu-plugin
1313
./plugins/hls-class-plugin
14-
-- ./plugins/hls-eval-plugin
14+
./plugins/hls-eval-plugin
1515
./plugins/hls-explicit-imports-plugin
16-
-- ./plugins/hls-refine-imports-plugin
17-
-- ./plugins/hls-hlint-plugin
18-
./plugins/hls-rename-plugin
19-
-- ./plugins/hls-retrie-plugin
20-
-- ./plugins/hls-haddock-comments-plugin
21-
-- ./plugins/hls-splice-plugin
16+
./plugins/hls-refine-imports-plugin
17+
./plugins/hls-hlint-plugin
18+
./plugins/hls-rename-plugin
19+
./plugins/hls-retrie-plugin
20+
./plugins/hls-haddock-comments-plugin
21+
./plugins/hls-splice-plugin
2222
./plugins/hls-qualify-imported-names-plugin
23-
-- ./plugins/hls-floskell-plugin
23+
./plugins/hls-floskell-plugin
2424
./plugins/hls-pragmas-plugin
2525
./plugins/hls-module-name-plugin
2626
./plugins/hls-ormolu-plugin
2727
./plugins/hls-call-hierarchy-plugin
28-
-- ./plugins/hls-alternate-number-format-plugin
29-
30-
source-repository-package
31-
type: git
32-
location: https://github.com/tfausak/unix-compat
33-
tag: 154c3a63f154cb49c51d5f9d13488e8119631d8a
34-
-- To fix windows build
35-
-- https://github.com/jacobstanley/unix-compat/pull/47
28+
./plugins/hls-alternate-number-format-plugin
3629

3730
repository head.hackage.ghc.haskell.org
3831
url: https://ghc.gitlab.haskell.org/head.hackage/
@@ -54,8 +47,7 @@ package *
5447

5548
write-ghc-environment-files: never
5649

57-
58-
index-state: 2022-01-10T17:57:05Z
50+
index-state: 2022-01-11T22:05:45Z
5951

6052
constraints:
6153
-- These plugins don't build/work on GHC92 yet
@@ -66,7 +58,6 @@ constraints:
6658
-callhierarchy
6759
-class
6860
-eval
69-
-floskell
7061
-haddockComments
7162
-hlint
7263
-moduleName
@@ -84,34 +75,59 @@ constraints:
8475
retrie >= 1.2,
8576
direct-sqlite == 2.3.26,
8677
lens >= 5.0.1,
87-
primitive-unlifted ==0.1.3.1,
88-
-- these constraints are for head.hackage
89-
aeson ==1.5.6.0,
78+
primitive-unlifted ==0.1.3.1
9079

9180
allow-newer:
92-
Cabal,
93-
base,
94-
binary,
95-
bytestring,
96-
ghc,
97-
ghc-bignum,
98-
ghc-prim,
99-
integer-gmp,
100-
template-haskell,
101-
text,
102-
time,
103-
104-
diagrams-postscript:lens,
105-
diagrams-postscript:diagrams-core,
106-
diagrams-postscript:monoid-extras,
107-
dependent-sum:some,
108-
dependent-sum:constraints,
109-
diagrams:diagrams-core,
110-
Chart-diagrams:diagrams-core,
111-
SVGFonts:diagrams-core,
81+
-- base,
82+
83+
-- for shake-bench
84+
Chart:lens,
85+
Chart-diagrams:lens,
11286

11387
-- for head.hackage
11488
primitive-unlifted:base,
11589

90+
brittany:ghc-boot,
91+
brittany:ghc-boot-th,
92+
brittany:ghc,
93+
brittany:ghc-exactprint,
94+
brittany:bytestring,
95+
brittany:base,
96+
-- https://github.com/lspitzner/multistate/pull/8
97+
multistate:base,
98+
-- https://github.com/lspitzner/data-tree-print/pull/3
99+
data-tree-print:base,
100+
-- https://github.com/lspitzner/butcher/pull/8
101+
butcher:base,
102+
103+
stylish-haskell:ghc-lib-parser,
104+
stylish-haskell:Cabal,
105+
stylish-haskell:bytestring,
106+
stylish-haskell:aeson,
107+
108+
ormolu:ghc-lib-parser,
109+
110+
fourmolu:ghc-lib-parser,
111+
fourmolu:Cabal,
112+
113+
hls-hlint-plugin:ghc-lib,
114+
hls-hlint-plugin:ghc-lib-parser,
115+
hls-hlint-plugin:ghc-lib-parser-ex,
116+
hlint:ghc-lib-parser,
117+
hlint:ghc-lib-parser-ex,
118+
-- See https://github.com/mpickering/apply-refact/pull/116
119+
apply-refact:base,
120+
121+
implicit-hie-cradle:bytestring,
122+
implicit-hie-cradle:time,
123+
124+
-- For tactics
125+
ghc-source-gen:ghc,
126+
127+
-- for ghcide:test via ghc-typelits-knownnat
128+
ghc-typelits-natnormalise:ghc-bignum,
129+
130+
hiedb:base
131+
116132
allow-older:
117133
primitive-extras:primitive-unlifted

‎ghcide/ghcide.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ library
107107
ghc-paths,
108108
cryptohash-sha1 >=0.11.100 && <0.12,
109109
hie-bios >= 0.8 && < 0.9.0,
110-
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
110+
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
111111
base16-bytestring >=0.1.1 && <1.1
112112
if os(windows)
113113
build-depends:

‎haskell-language-server.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,12 @@ common qualifyImportedNames
283283
-- formatters
284284

285285
common floskell
286-
if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
286+
if flag(floskell)
287287
build-depends: hls-floskell-plugin ^>=1.0.0.0
288288
cpp-options: -Dfloskell
289289

290290
common fourmolu
291-
if flag(fourmolu) && flag(ignore-plugins-ghc-bounds)
291+
if flag(fourmolu)
292292
build-depends: hls-fourmolu-plugin ^>=1.0.0.0
293293
cpp-options: -Dfourmolu
294294

‎hie-compat/hie-compat.cabal‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ flag ghc-lib
2323
library
2424
default-language: Haskell2010
2525
build-depends:
26-
base < 4.16, array, bytestring, containers, directory, filepath, transformers
26+
base < 4.17, array, bytestring, containers, directory, filepath, transformers
2727
if flag(ghc-lib)
2828
build-depends: ghc-lib
2929
else
@@ -50,5 +50,3 @@ library
5050
hs-source-dirs: src-reexport-ghc9
5151
if (impl(ghc >= 9.2) && impl(ghc < 9.3))
5252
hs-source-dirs: src-reexport-ghc9
53-
54-

0 commit comments

Comments
 (0)