Skip to content

Commit be0da87

Browse files
fendorcdsmith
fendor
authored and
cdsmith
committed
Drop ghc-api-compat from dependency closure (haskell#2128)
1 parent c4db72b commit be0da87

File tree

118 files changed

+3480
-1914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3480
-1914
lines changed

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@ jobs:
178178
name: Test hls-class-plugin
179179
run: cabal test hls-class-plugin --test-options="-j1 --rerun-update" || cabal test hls-class-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="-j1 --rerun"
180180

181-
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc }}
181+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
182182
name: Test hls-eval-plugin
183183
run: cabal test hls-eval-plugin --test-options="-j1 --rerun-update" || cabal test hls-eval-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="-j1 --rerun"
184184

185185
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
186186
name: Test hls-haddock-comments-plugin
187187
run: cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun-update" || cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun"
188188

189-
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
189+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
190190
name: Test hls-splice-plugin
191191
run: cabal test hls-splice-plugin --test-options="-j1 --rerun-update" || cabal test hls-splice-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="-j1 --rerun"
192192

@@ -206,7 +206,7 @@ jobs:
206206
name: Test hls-tactics-plugin test suite
207207
run: cabal test hls-tactics-plugin --test-options="-j1 --rerun-update" || cabal test hls-tactics-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="-j1 --rerun"
208208

209-
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
209+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
210210
name: Test hls-refine-imports-plugin test suite
211211
run: cabal test hls-refine-imports-plugin --test-options="-j1 --rerun-update" || cabal test hls-refine-imports-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refine-imports-plugin --test-options="-j1 --rerun"
212212

‎cabal-ghc901.project‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ 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
12-
-- ./plugins/hls-fourmolu-plugin
9+
-- ./plugins/hls-tactics-plugin
10+
-- ./plugins/hls-brittany-plugin
11+
-- ./plugins/hls-stylish-haskell-plugin
12+
-- ./plugins/hls-fourmolu-plugin
1313
-- ./plugins/hls-class-plugin
1414
./plugins/hls-eval-plugin
1515
./plugins/hls-explicit-imports-plugin
16-
-- ./plugins/hls-refine-imports-plugin
16+
./plugins/hls-refine-imports-plugin
1717
./plugins/hls-hlint-plugin
1818
./plugins/hls-rename-plugin
1919
./plugins/hls-retrie-plugin
2020
./plugins/hls-haddock-comments-plugin
21-
-- ./plugins/hls-splice-plugin
21+
./plugins/hls-splice-plugin
2222
./plugins/hls-floskell-plugin
2323
./plugins/hls-pragmas-plugin
2424
./plugins/hls-module-name-plugin
@@ -48,10 +48,10 @@ source-repository-package
4848

4949
source-repository-package
5050
type: git
51-
location: https://github.com/anka-213/dependent-sum
52-
tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5
51+
location: https://github.com/fendor/dependent-sum
52+
tag: 5de03c38b0de4945f4e9bce1b026110e69dc8118
5353
subdir: dependent-sum-template
54-
-- https://github.com/obsidiansystems/dependent-sum/pull/57
54+
-- https://github.com/obsidiansystems/dependent-sum/pull/59
5555

5656
-- benchmark dependency
5757
source-repository-package
@@ -64,8 +64,8 @@ write-ghc-environment-files: never
6464
index-state: 2021-09-06T12:12:22Z
6565

6666
constraints:
67-
-- These plugins doesn't work on GHC9 yet
68-
haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports
67+
-- These plugins don't work on GHC9 yet
68+
haskell-language-server -brittany -class -fourmolu -stylishhaskell -tactic
6969

7070
allow-newer:
7171
floskell:base,

‎cabal-ghc921.project‎

Lines changed: 275 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,275 @@
1+
packages:
2+
./
3+
./hie-compat
4+
./shake-bench
5+
./hls-graph
6+
./ghcide
7+
./hls-plugin-api
8+
./hls-test-utils
9+
-- ./plugins/hls-tactics-plugin
10+
-- ./plugins/hls-brittany-plugin
11+
-- ./plugins/hls-stylish-haskell-plugin
12+
-- ./plugins/hls-fourmolu-plugin
13+
./plugins/hls-class-plugin
14+
./plugins/hls-eval-plugin
15+
./plugins/hls-explicit-imports-plugin
16+
./plugins/hls-refine-imports-plugin
17+
./plugins/hls-hlint-plugin
18+
-- ./plugins/hls-retrie-plugin
19+
./plugins/hls-haddock-comments-plugin
20+
-- ./plugins/hls-splice-plugin
21+
./plugins/hls-floskell-plugin
22+
./plugins/hls-pragmas-plugin
23+
./plugins/hls-module-name-plugin
24+
./plugins/hls-ormolu-plugin
25+
./plugins/hls-call-hierarchy-plugin
26+
27+
tests: true
28+
29+
package *
30+
ghc-options: -haddock
31+
test-show-details: direct
32+
33+
source-repository-package
34+
type: git
35+
location: https://github.com/mithrandi/czipwith.git
36+
tag: b6245884ae83e00dd2b5261762549b37390179f8
37+
-- https://github.com/lspitzner/czipwith/pull/2
38+
39+
-- benchmark dependency
40+
source-repository-package
41+
type: git
42+
location: https://github.com/HeinrichApfelmus/operational
43+
tag: 16e19aaf34e286f3d27b3988c61040823ec66537
44+
45+
-- Head of hiedb
46+
source-repository-package
47+
type: git
48+
location: https://github.com/wz1000/HieDb
49+
tag: 45c4671db2da8ce5cd11e964573846cfbf3bbec8
50+
51+
-- GHC 9.2 for ghc-check
52+
source-repository-package
53+
type: git
54+
location: https://github.com/fendor/ghc-check
55+
tag: 224f3901eaa1b32a27e097968afd4a3894efa77e
56+
-- https://github.com/pepeiborra/ghc-check/pull/14/files
57+
58+
write-ghc-environment-files: never
59+
60+
index-state: 2021-08-31T02:21:16Z
61+
62+
constraints:
63+
-- These plugins doesn't work on GHC9 yet
64+
haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports -callhierarchy -retrie
65+
66+
67+
allow-newer:
68+
Cabal,
69+
base,
70+
binary,
71+
bytestring,
72+
ghc,
73+
ghc-bignum,
74+
ghc-prim,
75+
integer-gmp,
76+
template-haskell,
77+
text,
78+
time,
79+
80+
diagrams-postscript:lens,
81+
diagrams-postscript:diagrams-core,
82+
diagrams-postscript:monoid-extras,
83+
dependent-sum:some,
84+
dependent-sum:constraints,
85+
diagrams:diagrams-core,
86+
Chart-diagrams:diagrams-core,
87+
SVGFonts:diagrams-core
88+
89+
constraints:
90+
Agda ==2.6.1.3,
91+
Diff ==0.4.0,
92+
EdisonAPI ==1.3.1,
93+
EdisonCore ==1.3.2.1,
94+
FPretty ==1.1,
95+
HTTP ==4000.3.16,
96+
HUnit ==1.6.2.0,
97+
QuickCheck ==2.14.2,
98+
Spock-core ==0.14.0.0,
99+
aeson ==1.5.6.0,
100+
aivika ==5.9.1,
101+
aivika-transformers ==5.9.1,
102+
alex ==3.2.6,
103+
ansi-pretty ==0.1.2.2,
104+
arith-encode ==1.0.2,
105+
async ==2.2.3,
106+
async-pool ==0.9.1,
107+
attoparsec ==0.13.2.5 || ==0.14.1,
108+
barbies-th ==0.1.8,
109+
base-compat ==0.11.2,
110+
base-compat-batteries ==0.11.2,
111+
base16-bytestring ==1.0.1.0,
112+
basement ==0.0.12,
113+
bits ==0.5.3,
114+
blaze-builder ==0.4.2.1,
115+
blaze-textual ==0.2.1.0,
116+
boomerang ==1.4.7,
117+
bound ==2.0.3,
118+
box-tuples ==0.2.0.4,
119+
byteslice ==0.2.5.2,
120+
bytesmith ==0.3.7.0,
121+
bytestring-strict-builder ==0.4.5.4,
122+
cabal-doctest ==1.0.8,
123+
cantor-pairing ==0.2.0.1,
124+
cassava ==0.5.2.0,
125+
cborg ==0.2.5.0,
126+
cereal ==0.5.8.1,
127+
charset ==0.3.8,
128+
chaselev-deque ==0.5.0.5,
129+
classy-prelude ==1.5.0,
130+
combinat ==0.2.10.0,
131+
commonmark-extensions ==0.2.1.2,
132+
conduit ==1.3.4.1,
133+
constraints ==0.13,
134+
constraints-extras ==0.3.1.0,
135+
cql ==4.0.3,
136+
critbit ==0.2.0.0,
137+
cryptonite ==0.29,
138+
data-default-instances-new-base ==0.0.2,
139+
data-dword ==0.3.2,
140+
data-r-tree ==0.6.0,
141+
datetime ==0.3.1,
142+
deferred-folds ==0.9.17,
143+
dependent-sum-template ==0.1.0.3,
144+
deriving-compat ==0.5.10,
145+
diagrams-lib ==1.4.4,
146+
doctest ==0.18.1,
147+
dom-lt ==0.2.2.1,
148+
drinkery ==0.4,
149+
edit-distance ==0.2.2.1,
150+
emacs-module ==0.1.1,
151+
endo ==0.3.0.1,
152+
entropy ==0.4.1.6,
153+
enumeration ==0.2.0,
154+
extra ==1.7.9,
155+
fgl ==5.7.0.3,
156+
filepattern ==0.1.2,
157+
focus ==1.0.2,
158+
free-algebras ==0.1.0.1,
159+
free-functors ==1.2.1,
160+
generic-data ==0.9.2.0,
161+
generic-deriving ==1.14,
162+
generic-lens ==2.2.0.0,
163+
generic-lens-core ==2.2.0.0,
164+
generic-optics ==2.2.0.0,
165+
generics-sop ==0.5.1.1,
166+
geniplate-mirror ==0.7.8,
167+
ghc-events ==0.17.0,
168+
happy ==1.20.0,
169+
hashtables ==1.2.4.1,
170+
haskeline ==0.7.5.0,
171+
haskell-src-exts ==1.23.1,
172+
haskell-src-meta ==0.8.7,
173+
haxl ==2.3.0.0,
174+
heterocephalus ==1.0.5.4,
175+
hgeometry ==0.12.0.4,
176+
hgeometry-ipe ==0.12.0.0,
177+
hscolour ==1.24.4,
178+
hslogger ==1.3.1.0,
179+
hspec-core ==2.8.3,
180+
hspec-discover ==2.8.3,
181+
hspec-expectations ==0.8.2,
182+
hspec-meta ==2.7.8,
183+
hspec-wai ==0.11.1,
184+
http-types ==0.12.3,
185+
http2 ==3.0.2,
186+
hvect ==0.4.0.0,
187+
hxt ==9.3.1.22,
188+
inj-base ==0.2.0.0,
189+
inspection-testing ==0.4.6.0,
190+
invariant ==0.5.4,
191+
io-choice ==0.0.7,
192+
iproute ==1.7.11,
193+
language-c ==0.9.0.1,
194+
language-haskell-extract ==0.2.4,
195+
language-javascript ==0.7.1.0,
196+
lens ==5.0.1,
197+
lens-family-th ==0.5.2.0,
198+
list-t ==1.0.4,
199+
lockfree-queue ==0.2.3.1,
200+
memory ==0.16.0,
201+
microlens-ghc ==0.4.13,
202+
monad-validate ==1.2.0.0,
203+
monadplus ==1.4.2,
204+
mono-traversable ==1.0.15.1,
205+
mono-traversable-keys ==0.1.0,
206+
mustache ==2.3.1,
207+
network ==3.1.2.2,
208+
newtype-generics ==0.6,
209+
obdd ==0.8.2,
210+
optics-th ==0.4,
211+
packman ==0.5.0,
212+
pandoc ==2.14.2,
213+
parameterized-utils ==2.1.3.0,
214+
partial-isomorphisms ==0.2.2.1,
215+
pem ==0.2.4,
216+
persistent ==2.13.0.3 || ==2.13.1.1,
217+
plots ==0.1.1.2,
218+
pointed ==5.0.2,
219+
posix-api ==0.3.5.0,
220+
primitive-extras ==0.10.1.1,
221+
primitive-sort ==0.1.0.0,
222+
primitive-unlifted ==0.1.3.0,
223+
proto3-wire ==1.2.2,
224+
quickcheck-instances ==0.3.25.2,
225+
random ==1.2.0,
226+
relude ==1.0.0.1,
227+
row-types ==1.0.1.0,
228+
safe ==0.3.19,
229+
safecopy ==0.10.4.2,
230+
salak ==0.3.6,
231+
securemem ==0.1.10,
232+
semialign ==1.2,
233+
semigroupoids ==5.3.5,
234+
serialise ==0.2.3.0,
235+
servant ==0.18.3,
236+
shake ==0.19.5,
237+
shakespeare ==2.0.25,
238+
singletons ==3.0,
239+
singletons-base ==3.0,
240+
siphash ==1.0.3,
241+
snap-core ==1.0.4.2,
242+
streaming-commons ==0.2.2.1,
243+
streamly ==0.8.0,
244+
subcategories ==0.1.1.0,
245+
test-framework ==0.8.2.0,
246+
text-format ==0.3.2,
247+
text-short ==0.1.3,
248+
text-show ==3.9,
249+
th-desugar ==1.12,
250+
th-extras ==0.0.0.4,
251+
threads ==0.5.1.6,
252+
tls ==1.5.5,
253+
tpdb ==2.2.0,
254+
tree-diff ==0.2,
255+
true-name ==0.1.0.3,
256+
uniplate ==1.6.13,
257+
unordered-containers ==0.2.14.0,
258+
validity ==0.11.0.1,
259+
vector-builder ==0.3.8.2,
260+
vector-circular ==0.1.3,
261+
vector-th-unbox ==0.2.1.9,
262+
vinyl ==0.13.3,
263+
vty ==5.33,
264+
wai-app-static ==3.1.7.2,
265+
wai-extra ==3.1.6,
266+
wai-middleware-static ==0.9.0,
267+
warp ==3.3.17,
268+
winery ==1.3.2,
269+
witherable ==0.4.1,
270+
x509 ==1.7.5,
271+
x509-validation ==1.6.11,
272+
xlsx ==0.8.4,
273+
xml-hamlet ==0.5.0.1,
274+
yaml ==0.11.5.0,
275+
yesod-core ==1.6.21.0

0 commit comments

Comments
 (0)