Skip to content

Commit 7a2730e

Browse files
pepeiborrapepeiborra
committed
Remove ghc-api source snapshot
We can replace the source snapshot with Cabal conditions. This will unblock Hackage uploads until #2128 lands
1 parent 1cf1ae6 commit 7a2730e

17 files changed

+87
-41
lines changed

‎cabal-ghc901.project

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ source-repository-package
3939
tag: b6245884ae83e00dd2b5261762549b37390179f8
4040
-- https://github.com/lspitzner/czipwith/pull/2
4141

42-
source-repository-package
43-
type: git
44-
location: https://github.com/hsyl20/ghc-api-compat
45-
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46-
4742
source-repository-package
4843
type: git
4944
location: https://github.com/anka-213/th-extras

‎cabal.project

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ package *
3131
ghc-options: -haddock
3232
test-show-details: direct
3333

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

42-
index-state: 2021-08-12T12:00:38Z
36+
index-state: 2021-08-30T20:52:40Z
4337

4438
constraints:
4539
hyphenation +embed

‎ghcide/ghcide.cabal

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ library
9999
ghc >= 8.6,
100100
ghc-check >=0.5.0.4,
101101
ghc-paths,
102-
ghc-api-compat,
103102
cryptohash-sha1 >=0.11.100 && <0.12,
104103
hie-bios >= 0.7.1 && < 0.9.0,
105104
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
@@ -111,6 +110,16 @@ library
111110
build-depends:
112111
unix
113112

113+
if impl(ghc == 8.10.5)
114+
build-depends:
115+
ghc-api-compat ==8.10.5
116+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
117+
build-depends:
118+
ghc-api-compat ==8.10.6
119+
else
120+
build-depends:
121+
ghc-api-compat ==8.6
122+
114123
default-extensions:
115124
ApplicativeDo
116125
BangPatterns

‎haskell-language-server.cabal

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ executable haskell-language-server
338338
, cryptohash-sha1
339339
, deepseq
340340
, ghc
341-
, ghc-api-compat
342341
, ghc-boot-th
343342
, ghcide
344343
, hashable
@@ -361,6 +360,16 @@ executable haskell-language-server
361360
, transformers
362361
, unordered-containers
363362

363+
if impl(ghc == 8.10.5)
364+
build-depends:
365+
ghc-api-compat ==8.10.5
366+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
367+
build-depends:
368+
ghc-api-compat ==8.10.6
369+
else
370+
build-depends:
371+
ghc-api-compat ==8.6
372+
364373
default-language: Haskell2010
365374
default-extensions: DataKinds, TypeOperators
366375

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

Lines changed: 10 additions & 1 deletion
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,16 @@ library
5756
, text
5857
, unordered-containers
5958

59+
if impl(ghc == 8.10.5)
60+
build-depends:
61+
ghc-api-compat ==8.10.5
62+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
63+
build-depends:
64+
ghc-api-compat ==8.10.6
65+
else
66+
build-depends:
67+
ghc-api-compat ==8.6
68+
6069
if os(windows)
6170
build-depends: Win32
6271

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

Lines changed: 10 additions & 1 deletion
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,16 @@ 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.10.5
45+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
46+
build-depends:
47+
ghc-api-compat ==8.10.6
48+
else
49+
build-depends:
50+
ghc-api-compat ==8.6
51+
4352
test-suite tests
4453
type: exitcode-stdio-1.0
4554
default-language: Haskell2010

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

Lines changed: 10 additions & 1 deletion
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,16 @@ library
3736
, text
3837
, transformers
3938

39+
if impl(ghc == 8.10.5)
40+
build-depends:
41+
ghc-api-compat ==8.10.5
42+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
43+
build-depends:
44+
ghc-api-compat ==8.10.6
45+
else
46+
build-depends:
47+
ghc-api-compat ==8.6
48+
4049
default-language: Haskell2010
4150
default-extensions:
4251
DataKinds

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,23 @@ 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.10.5
32+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
33+
build-depends:
34+
ghc-api-compat ==8.10.6
35+
else
36+
build-depends:
37+
ghc-api-compat ==8.6
38+
3039
default-language: Haskell2010
3140
default-extensions:
3241
DataKinds

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ library
2323
, base >=4.12 && <5
2424
, filepath
2525
, ghc
26-
, ghc-api-compat
2726
, ghc-boot-th
2827
, ghcide >=1.2 && <1.5
2928
, hls-plugin-api >=1.1 && <1.3
@@ -34,6 +33,16 @@ library
3433

3534
default-language: Haskell2010
3635

36+
if impl(ghc == 8.10.5)
37+
build-depends:
38+
ghc-api-compat ==8.10.5
39+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
40+
build-depends:
41+
ghc-api-compat ==8.10.6
42+
else
43+
build-depends:
44+
ghc-api-compat ==8.6
45+
3746
test-suite tests
3847
type: exitcode-stdio-1.0
3948
default-language: Haskell2010

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

Lines changed: 10 additions & 1 deletion
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,16 @@ library
3332
, transformers
3433
, unordered-containers
3534

35+
if impl(ghc == 8.10.5)
36+
build-depends:
37+
ghc-api-compat ==8.10.5
38+
elif impl(ghc > 8.10.5) && impl(ghc < 9)
39+
build-depends:
40+
ghc-api-compat ==8.10.6
41+
else
42+
build-depends:
43+
ghc-api-compat ==8.6
44+
3645
default-language: Haskell2010
3746
default-extensions:
3847
DataKinds

0 commit comments

Comments
 (0)