Skip to content

Commit 0ccd6d7

Browse files
pepeiborrapepeiborra
committed
Remove ghc-api source snapshot (#2156)
* Remove ghc-api source snapshot We can replace the source snapshot with Cabal conditions. This will unblock Hackage uploads until #2128 lands * fix 9.0.1 build * add allow-newer for ghc-api-compat * fix version bounds for 9.0.1 * fix hls-eval-plugin * stack fixes * added new versions of ghc-api-compat * remove source snapshot from ghc901 cabal project
1 parent 16b4030 commit 0ccd6d7

20 files changed

+156
-50
lines changed

‎cabal-ghc901.project

+1-6
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ source-repository-package
4848
tag: 9b1445ab5efcabfad54043fc9b8e50e9d8c5bbf3
4949
-- https://github.com/mpickering/hie-bios/pull/285
5050

51-
source-repository-package
52-
type: git
53-
location: https://github.com/hsyl20/ghc-api-compat
54-
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
55-
5651
source-repository-package
5752
type: git
5853
location: https://github.com/anka-213/th-extras
@@ -75,7 +70,7 @@ source-repository-package
7570

7671
write-ghc-environment-files: never
7772

78-
index-state: 2021-08-12T12:00:38Z
73+
index-state: 2021-09-06T12:12:22Z
7974

8075
constraints:
8176
-- These plugins doesn't work on GHC9 yet

‎cabal.project

+1-8
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,13 @@ package *
3030
ghc-options: -haddock
3131
test-show-details: direct
3232

33-
-- see https://gitlab.haskell.org/haskell/ghc-api-compat/-/issues/1#note_371055
34-
source-repository-package
35-
type: git
36-
location: https://github.com/hsyl20/ghc-api-compat
37-
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
38-
3933
write-ghc-environment-files: never
4034

41-
index-state: 2021-08-12T12:00:38Z
35+
index-state: 2021-09-06T12:12:22Z
4236

4337
constraints:
4438
hyphenation +embed
4539

46-
4740
allow-newer:
4841
-- for shake-bench
4942
Chart-diagrams:diagrams-core,

‎ghcide/ghcide.cabal

+16-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ library
9898
ghc >= 8.6,
9999
ghc-check >=0.5.0.4,
100100
ghc-paths,
101-
ghc-api-compat,
102101
cryptohash-sha1 >=0.11.100 && <0.12,
103102
hie-bios >= 0.7.1 && < 0.8.0,
104103
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
@@ -110,6 +109,22 @@ library
110109
build-depends:
111110
unix
112111

112+
if impl(ghc < 8.10.5)
113+
build-depends:
114+
ghc-api-compat ==8.6
115+
elif impl(ghc == 8.10.5)
116+
build-depends:
117+
ghc-api-compat ==8.10.5
118+
elif impl(ghc == 8.10.6)
119+
build-depends:
120+
ghc-api-compat ==8.10.6
121+
elif impl(ghc == 8.10.7)
122+
build-depends:
123+
ghc-api-compat ==8.10.7
124+
elif impl(ghc == 9.0.1)
125+
build-depends:
126+
ghc-api-compat ==9.0.1
127+
113128
default-extensions:
114129
ApplicativeDo
115130
BangPatterns

‎haskell-language-server.cabal

+16-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ executable haskell-language-server
327327
, cryptohash-sha1
328328
, deepseq
329329
, ghc
330-
, ghc-api-compat
331330
, ghc-boot-th
332331
, ghcide
333332
, hashable
@@ -350,6 +349,22 @@ executable haskell-language-server
350349
, transformers
351350
, unordered-containers
352351

352+
if impl(ghc < 8.10.5)
353+
build-depends:
354+
ghc-api-compat ==8.6
355+
elif impl(ghc == 8.10.5)
356+
build-depends:
357+
ghc-api-compat ==8.10.5
358+
elif impl(ghc == 8.10.6)
359+
build-depends:
360+
ghc-api-compat ==8.10.6
361+
elif impl(ghc == 8.10.7)
362+
build-depends:
363+
ghc-api-compat ==8.10.7
364+
elif impl(ghc == 9.0.1)
365+
build-depends:
366+
ghc-api-compat ==9.0.1
367+
353368
default-language: Haskell2010
354369
default-extensions: DataKinds, TypeOperators
355370

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ library
4444
, Diff ^>=0.4.0
4545
, dlist
4646
, ghc
47-
, ghc-api-compat
4847
, hashable
4948
, hls-graph ^>=1.4
5049
, hslogger
@@ -57,6 +56,22 @@ library
5756
, text
5857
, unordered-containers
5958

59+
if impl(ghc < 8.10.5)
60+
build-depends:
61+
ghc-api-compat ==8.6
62+
elif impl(ghc == 8.10.5)
63+
build-depends:
64+
ghc-api-compat ==8.10.5
65+
elif impl(ghc == 8.10.6)
66+
build-depends:
67+
ghc-api-compat ==8.10.6
68+
elif impl(ghc == 8.10.7)
69+
build-depends:
70+
ghc-api-compat ==8.10.7
71+
elif impl(ghc == 9.0.1)
72+
build-depends:
73+
ghc-api-compat ==9.0.1
74+
6075
if os(windows)
6176
build-depends: Win32
6277

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ library
2727
, containers
2828
, extra
2929
, ghc
30-
, ghc-api-compat
3130
, ghcide ^>=1.4.1
3231
, hiedb
3332
, hls-plugin-api ^>=1.2
@@ -40,6 +39,22 @@ library
4039
default-language: Haskell2010
4140
default-extensions: DataKinds
4241

42+
if impl(ghc < 8.10.5)
43+
build-depends:
44+
ghc-api-compat ==8.6
45+
elif impl(ghc == 8.10.5)
46+
build-depends:
47+
ghc-api-compat ==8.10.5
48+
elif impl(ghc == 8.10.6)
49+
build-depends:
50+
ghc-api-compat ==8.10.6
51+
elif impl(ghc == 8.10.7)
52+
build-depends:
53+
ghc-api-compat ==8.10.7
54+
elif impl(ghc == 9.0.1)
55+
build-depends:
56+
ghc-api-compat ==9.0.1
57+
4358
test-suite tests
4459
type: exitcode-stdio-1.0
4560
default-language: Haskell2010

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ library
2828
, base >=4.12 && <5
2929
, containers
3030
, ghc
31-
, ghc-api-compat
3231
, ghc-exactprint
3332
, ghcide >=1.2 && <1.5
3433
, hls-plugin-api >=1.1 && <1.3
@@ -37,6 +36,22 @@ library
3736
, text
3837
, transformers
3938

39+
if impl(ghc < 8.10.5)
40+
build-depends:
41+
ghc-api-compat ==8.6
42+
elif impl(ghc == 8.10.5)
43+
build-depends:
44+
ghc-api-compat ==8.10.5
45+
elif impl(ghc == 8.10.6)
46+
build-depends:
47+
ghc-api-compat ==8.10.6
48+
elif impl(ghc == 8.10.7)
49+
build-depends:
50+
ghc-api-compat ==8.10.7
51+
elif impl(ghc == 9.0.1)
52+
build-depends:
53+
ghc-api-compat ==9.0.1
54+
4055
default-language: Haskell2010
4156
default-extensions:
4257
DataKinds

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ library
6161
, extra
6262
, filepath
6363
, ghc
64-
, ghc-api-compat
6564
, ghc-boot-th
6665
, ghc-paths
6766
, ghcide >=1.2 && <1.5
@@ -83,6 +82,22 @@ library
8382
, unliftio
8483
, unordered-containers
8584

85+
if impl(ghc < 8.10.5)
86+
build-depends:
87+
ghc-api-compat ==8.6
88+
elif impl(ghc == 8.10.5)
89+
build-depends:
90+
ghc-api-compat ==8.10.5
91+
elif impl(ghc == 8.10.6)
92+
build-depends:
93+
ghc-api-compat ==8.10.6
94+
elif impl(ghc == 8.10.7)
95+
build-depends:
96+
ghc-api-compat ==8.10.7
97+
elif impl(ghc == 9.0.1)
98+
build-depends:
99+
ghc-api-compat ==9.0.1
100+
86101
ghc-options:
87102
-Wall -Wno-name-shadowing -Wno-unticked-promoted-constructors
88103

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,29 @@ library
1919
, containers
2020
, deepseq
2121
, ghc
22-
, ghc-api-compat
2322
, ghcide ^>=1.4
2423
, hls-graph
2524
, hls-plugin-api >=1.1 && <1.3
2625
, lsp
2726
, text
2827
, unordered-containers
2928

29+
if impl(ghc < 8.10.5)
30+
build-depends:
31+
ghc-api-compat ==8.6
32+
elif impl(ghc == 8.10.5)
33+
build-depends:
34+
ghc-api-compat ==8.10.5
35+
elif impl(ghc == 8.10.6)
36+
build-depends:
37+
ghc-api-compat ==8.10.6
38+
elif impl(ghc == 8.10.7)
39+
build-depends:
40+
ghc-api-compat ==8.10.7
41+
elif impl(ghc == 9.0.1)
42+
build-depends:
43+
ghc-api-compat ==9.0.1
44+
3045
default-language: Haskell2010
3146
default-extensions:
3247
DataKinds

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

+16
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,22 @@ library
3333

3434
default-language: Haskell2010
3535

36+
if impl(ghc < 8.10.5)
37+
build-depends:
38+
ghc-api-compat ==8.6
39+
elif impl(ghc == 8.10.5)
40+
build-depends:
41+
ghc-api-compat ==8.10.5
42+
elif impl(ghc == 8.10.6)
43+
build-depends:
44+
ghc-api-compat ==8.10.6
45+
elif impl(ghc == 8.10.7)
46+
build-depends:
47+
ghc-api-compat ==8.10.7
48+
elif impl(ghc == 9.0.1)
49+
build-depends:
50+
ghc-api-compat ==9.0.1
51+
3652
test-suite tests
3753
type: exitcode-stdio-1.0
3854
default-language: Haskell2010

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ library
2121
, directory
2222
, extra
2323
, ghc
24-
, ghc-api-compat
2524
, ghcide >=1.2 && <1.5
2625
, hashable
2726
, hls-plugin-api >=1.1 && <1.3
@@ -33,6 +32,22 @@ library
3332
, transformers
3433
, unordered-containers
3534

35+
if impl(ghc < 8.10.5)
36+
build-depends:
37+
ghc-api-compat ==8.6
38+
elif impl(ghc == 8.10.5)
39+
build-depends:
40+
ghc-api-compat ==8.10.5
41+
elif impl(ghc == 8.10.6)
42+
build-depends:
43+
ghc-api-compat ==8.10.6
44+
elif impl(ghc == 8.10.7)
45+
build-depends:
46+
ghc-api-compat ==8.10.7
47+
elif impl(ghc == 9.0.1)
48+
build-depends:
49+
ghc-api-compat ==9.0.1
50+
3651
default-language: Haskell2010
3752
default-extensions:
3853
DataKinds

‎stack-8.10.2.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ extra-deps:
3737
- data-tree-print-0.1.0.2@rev:2
3838
- floskell-0.10.4
3939
- fourmolu-0.3.0.0
40-
- # ghc-api-compat-8.6
41-
github: hsyl20/ghc-api-compat
42-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
40+
- ghc-api-compat-8.6
4341
- ghc-check-0.5.0.4
4442
- ghc-exactprint-0.6.4
4543
- ghc-lib-8.10.4.20210206

‎stack-8.10.3.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ extra-deps:
3737
- data-tree-print-0.1.0.2@rev:2
3838
- floskell-0.10.4
3939
- fourmolu-0.3.0.0
40-
- # ghc-api-compat-8.6
41-
github: hsyl20/ghc-api-compat
42-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
40+
- ghc-api-compat-8.6
4341
- ghc-check-0.5.0.4
4442
- ghc-exactprint-0.6.4
4543
- ghc-lib-8.10.4.20210206

‎stack-8.10.4.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ extra-deps:
3737
- data-tree-print-0.1.0.2@rev:2
3838
- floskell-0.10.4
3939
- fourmolu-0.3.0.0
40-
- # ghc-api-compat-8.6
41-
github: hsyl20/ghc-api-compat
42-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
40+
- ghc-api-compat-8.6
4341
- ghc-check-0.5.0.4
4442
- ghc-exactprint-0.6.4
4543
- ghc-source-gen-0.4.1.0

‎stack-8.10.5.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ extra-deps:
3939
- data-tree-print-0.1.0.2@rev:2
4040
- floskell-0.10.5
4141
- fourmolu-0.3.0.0
42-
- # ghc-api-compat-8.6
43-
github: hsyl20/ghc-api-compat
44-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
42+
- ghc-api-compat-8.10.5
4543
- ghc-check-0.5.0.4
4644
- ghc-exactprint-0.6.4
4745
- ghc-source-gen-0.4.1.0

‎stack-8.6.4.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ extra-deps:
4444
- floskell-0.10.4
4545
- fourmolu-0.3.0.0
4646
- fuzzy-0.1.0.0
47-
- # ghc-api-compat-8.6
48-
github: hsyl20/ghc-api-compat
49-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
47+
- ghc-api-compat-8.6
5048
- ghc-check-0.5.0.4
5149
- ghc-events-0.13.0
5250
- ghc-exactprint-0.6.4

‎stack-8.6.5.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ extra-deps:
4545
- floskell-0.10.4
4646
- fourmolu-0.3.0.0
4747
- fuzzy-0.1.0.0
48-
- # ghc-api-compat-8.6
49-
github: hsyl20/ghc-api-compat
50-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
48+
- ghc-api-compat-8.6
5149
- ghc-check-0.5.0.4
5250
- ghc-events-0.13.0
5351
- ghc-exactprint-0.6.4

‎stack-8.8.3.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ extra-deps:
3939
- constrained-dynamic-0.1.0.0
4040
- floskell-0.10.4
4141
- fourmolu-0.3.0.0
42-
- # ghc-api-compat-8.6
43-
github: hsyl20/ghc-api-compat
44-
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
42+
- ghc-api-compat-8.6
4543
- ghc-check-0.5.0.4
4644
- ghc-exactprint-0.6.4
4745
- ghc-lib-8.10.4.20210206

0 commit comments

Comments
 (0)