Skip to content

Commit ff9508a

Browse files
pepeiborrapepeiborra
committed
added new versions of ghc-api-compat
1 parent 851c6a3 commit ff9508a

File tree

13 files changed

+59
-40
lines changed

13 files changed

+59
-40
lines changed

‎cabal-ghc901.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ source-repository-package
6666

6767
write-ghc-environment-files: never
6868

69-
index-state: 2021-08-30T20:52:40Z
69+
index-state: 2021-09-06T12:12:22Z
7070

7171
constraints:
7272
-- These plugins doesn't work on GHC9 yet

‎cabal.project

+1-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@ package *
3333

3434
write-ghc-environment-files: never
3535

36-
index-state: 2021-08-30T20:52:40Z
36+
index-state: 2021-09-06T12:12:22Z
3737

3838
constraints:
3939
hyphenation +embed
4040

41-
4241
allow-newer:
43-
-- for ghc 8.10.7
44-
ghc-api-compat:ghc,
4542
-- for shake-bench
4643
Chart-diagrams:diagrams-core,
4744
SVGFonts:diagrams-core

‎ghcide/ghcide.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,15 @@ library
116116
elif impl(ghc == 8.10.5)
117117
build-depends:
118118
ghc-api-compat ==8.10.5
119-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
119+
elif impl(ghc == 8.10.6)
120120
build-depends:
121121
ghc-api-compat ==8.10.6
122-
else
122+
elif impl(ghc == 8.10.7)
123+
build-depends:
124+
ghc-api-compat ==8.10.7
125+
elif impl(ghc == 9.0.1)
123126
build-depends:
124-
ghc-api-compat
127+
ghc-api-compat ==9.0.1
125128

126129
default-extensions:
127130
ApplicativeDo

‎haskell-language-server.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,15 @@ executable haskell-language-server
366366
elif impl(ghc == 8.10.5)
367367
build-depends:
368368
ghc-api-compat ==8.10.5
369-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
369+
elif impl(ghc == 8.10.6)
370370
build-depends:
371371
ghc-api-compat ==8.10.6
372-
else
372+
elif impl(ghc == 8.10.7)
373373
build-depends:
374-
ghc-api-compat
374+
ghc-api-compat ==8.10.7
375+
elif impl(ghc == 9.0.1)
376+
build-depends:
377+
ghc-api-compat ==9.0.1
375378

376379
default-language: Haskell2010
377380
default-extensions: DataKinds, TypeOperators

‎hls-plugin-api/hls-plugin-api.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,15 @@ library
6262
elif impl(ghc == 8.10.5)
6363
build-depends:
6464
ghc-api-compat ==8.10.5
65-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
65+
elif impl(ghc == 8.10.6)
6666
build-depends:
6767
ghc-api-compat ==8.10.6
68-
else
68+
elif impl(ghc == 8.10.7)
69+
build-depends:
70+
ghc-api-compat ==8.10.7
71+
elif impl(ghc == 9.0.1)
6972
build-depends:
70-
ghc-api-compat
73+
ghc-api-compat ==9.0.1
7174

7275
if os(windows)
7376
build-depends: Win32

‎plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ library
4545
elif impl(ghc == 8.10.5)
4646
build-depends:
4747
ghc-api-compat ==8.10.5
48-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
48+
elif impl(ghc == 8.10.6)
4949
build-depends:
5050
ghc-api-compat ==8.10.6
51-
else
51+
elif impl(ghc == 8.10.7)
5252
build-depends:
53-
ghc-api-compat
53+
ghc-api-compat ==8.10.7
54+
elif impl(ghc == 9.0.1)
55+
build-depends:
56+
ghc-api-compat ==9.0.1
5457

5558
test-suite tests
5659
type: exitcode-stdio-1.0

‎plugins/hls-class-plugin/hls-class-plugin.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,15 @@ library
4242
elif impl(ghc == 8.10.5)
4343
build-depends:
4444
ghc-api-compat ==8.10.5
45-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
45+
elif impl(ghc == 8.10.6)
4646
build-depends:
4747
ghc-api-compat ==8.10.6
48-
else
48+
elif impl(ghc == 8.10.7)
4949
build-depends:
50-
ghc-api-compat
50+
ghc-api-compat ==8.10.7
51+
elif impl(ghc == 9.0.1)
52+
build-depends:
53+
ghc-api-compat ==9.0.1
5154

5255
default-language: Haskell2010
5356
default-extensions:

‎plugins/hls-eval-plugin/hls-eval-plugin.cabal

+7-4
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,22 @@ library
8181
, transformers
8282
, unliftio
8383
, unordered-containers
84-
84+
8585
if impl(ghc < 8.10.5)
8686
build-depends:
8787
ghc-api-compat ==8.6
8888
elif impl(ghc == 8.10.5)
8989
build-depends:
9090
ghc-api-compat ==8.10.5
91-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
91+
elif impl(ghc == 8.10.6)
9292
build-depends:
9393
ghc-api-compat ==8.10.6
94-
else
94+
elif impl(ghc == 8.10.7)
95+
build-depends:
96+
ghc-api-compat ==8.10.7
97+
elif impl(ghc == 9.0.1)
9598
build-depends:
96-
ghc-api-compat
99+
ghc-api-compat ==9.0.1
97100

98101
ghc-options:
99102
-Wall -Wno-name-shadowing -Wno-unticked-promoted-constructors

‎plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ library
3232
elif impl(ghc == 8.10.5)
3333
build-depends:
3434
ghc-api-compat ==8.10.5
35-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
35+
elif impl(ghc == 8.10.6)
3636
build-depends:
3737
ghc-api-compat ==8.10.6
38-
else
38+
elif impl(ghc == 8.10.7)
3939
build-depends:
40-
ghc-api-compat
40+
ghc-api-compat ==8.10.7
41+
elif impl(ghc == 9.0.1)
42+
build-depends:
43+
ghc-api-compat ==9.0.1
4144

4245
default-language: Haskell2010
4346
default-extensions:

‎plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ library
3939
elif impl(ghc == 8.10.5)
4040
build-depends:
4141
ghc-api-compat ==8.10.5
42-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
42+
elif impl(ghc == 8.10.6)
4343
build-depends:
4444
ghc-api-compat ==8.10.6
45-
else
45+
elif impl(ghc == 8.10.7)
4646
build-depends:
47-
ghc-api-compat
47+
ghc-api-compat ==8.10.7
48+
elif impl(ghc == 9.0.1)
49+
build-depends:
50+
ghc-api-compat ==9.0.1
4851

4952
test-suite tests
5053
type: exitcode-stdio-1.0

‎plugins/hls-retrie-plugin/hls-retrie-plugin.cabal

+6-3
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,15 @@ library
3838
elif impl(ghc == 8.10.5)
3939
build-depends:
4040
ghc-api-compat ==8.10.5
41-
elif impl(ghc > 8.10.5) && impl(ghc < 9)
41+
elif impl(ghc == 8.10.6)
4242
build-depends:
4343
ghc-api-compat ==8.10.6
44-
else
44+
elif impl(ghc == 8.10.7)
4545
build-depends:
46-
ghc-api-compat
46+
ghc-api-compat ==8.10.7
47+
elif impl(ghc == 9.0.1)
48+
build-depends:
49+
ghc-api-compat ==9.0.1
4750

4851
default-language: Haskell2010
4952
default-extensions:

‎stack-8.10.7.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extra-deps:
3535
- bytestring-encoding-0.1.1.0@sha256:1c3b97eb6345fd7153006211c8272215cd78bb0cf440c41185290822f1e3f2c2,1738
3636
- data-tree-print-0.1.0.2@sha256:d845e99f322df70e0c06d6743bf80336f5918d5423498528beb0593a2afc1703,1620
3737
- floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803
38-
- ghc-api-compat-8.10.6@sha256:cde370b1b4c8a090de1ba6a8e27f65def9af43ca88710b412a6545b876568626,3324
38+
- ghc-api-compat-8.10.7
3939
- heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
4040
- hiedb-0.4.0.0@sha256:b6dadd5cefc8c1052bc4b29144f616ca9c22e863a96d8e447d66a4d32c96fd4a,2987
4141
- implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
@@ -55,9 +55,6 @@ extra-deps:
5555
# - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642
5656
# - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
5757

58-
# for ghc-api-compat-8.10.6
59-
allow-newer: true
60-
6158
configure-options:
6259
ghcide:
6360
- --disable-library-for-ghci

‎stack-9.0.1.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extra-deps:
3737
- dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
3838
- dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
3939
- floskell-0.10.5
40+
- ghc-api-compat-9.0.1
4041
- ghc-source-gen-0.4.1.0
4142
- heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
4243
- hie-bios-0.7.6
@@ -59,9 +60,6 @@ extra-deps:
5960
commit: b6245884ae83e00dd2b5261762549b37390179f8
6061
# https://github.com/lspitzner/czipwith/pull/2
6162

62-
- github: hsyl20/ghc-api-compat
63-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
64-
6563
- github: anka-213/th-extras
6664
commit: 57a97b4df128eb7b360e8ab9c5759392de8d1659
6765
# https://github.com/mokus0/th-extras/pull/8

0 commit comments

Comments
 (0)