Skip to content

Commit

Permalink
Remove ghc-api source snapshot
Browse files Browse the repository at this point in the history 
We can replace the source snapshot with Cabal conditions.
This will unblock Hackage uploads until
#2128 lands
  • Loading branch information
@pepeiborra
pepeiborra committed Sep 4, 2021
1 parent 1cf1ae6 commit 7a2730e
Show file tree
Hide file tree
Showing 17 changed files with 87 additions and 41 deletions.
5 changes: 0 additions & 5 deletions cabal-ghc901.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ source-repository-package
tag: b6245884ae83e00dd2b5261762549b37390179f8
-- https://github.com/lspitzner/czipwith/pull/2

source-repository-package
type: git
location: https://github.com/hsyl20/ghc-api-compat
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15

source-repository-package
type: git
location: https://github.com/anka-213/th-extras
Expand Down
8 changes: 1 addition & 7 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,9 @@ package *
ghc-options: -haddock
test-show-details: direct

-- see https://gitlab.haskell.org/haskell/ghc-api-compat/-/issues/1#note_371055
source-repository-package
type: git
location: https://github.com/hsyl20/ghc-api-compat
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15

write-ghc-environment-files: never

index-state: 2021-08-12T12:00:38Z
index-state: 2021-08-30T20:52:40Z

constraints:
hyphenation +embed
Expand Down
11 changes: 10 additions & 1 deletion ghcide/ghcide.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ library
ghc >= 8.6,
ghc-check >=0.5.0.4,
ghc-paths,
ghc-api-compat,
cryptohash-sha1 >=0.11.100 && <0.12,
hie-bios >= 0.7.1 && < 0.9.0,
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
Expand All @@ -111,6 +110,16 @@ library
build-depends:
unix

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

default-extensions:
ApplicativeDo
BangPatterns
Expand Down
11 changes: 10 additions & 1 deletion haskell-language-server.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ executable haskell-language-server
, cryptohash-sha1
, deepseq
, ghc
, ghc-api-compat
, ghc-boot-th
, ghcide
, hashable
Expand All @@ -361,6 +360,16 @@ executable haskell-language-server
, transformers
, unordered-containers

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

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

Expand Down
11 changes: 10 additions & 1 deletion hls-plugin-api/hls-plugin-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ library
, Diff ^>=0.4.0
, dlist
, ghc
, ghc-api-compat
, hashable
, hls-graph ^>=1.4
, hslogger
Expand All @@ -57,6 +56,16 @@ library
, text
, unordered-containers

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

if os(windows)
build-depends: Win32

Expand Down
11 changes: 10 additions & 1 deletion plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ library
, containers
, extra
, ghc
, ghc-api-compat
, ghcide ^>=1.4.1
, hiedb
, hls-plugin-api ^>=1.2
Expand All @@ -40,6 +39,16 @@ library
default-language: Haskell2010
default-extensions: DataKinds

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

test-suite tests
type: exitcode-stdio-1.0
default-language: Haskell2010
Expand Down
11 changes: 10 additions & 1 deletion plugins/hls-class-plugin/hls-class-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ library
, base >=4.12 && <5
, containers
, ghc
, ghc-api-compat
, ghc-exactprint
, ghcide >=1.2 && <1.5
, hls-plugin-api >=1.1 && <1.3
Expand All @@ -37,6 +36,16 @@ library
, text
, transformers

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
11 changes: 10 additions & 1 deletion plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,23 @@ library
, containers
, deepseq
, ghc
, ghc-api-compat
, ghcide ^>=1.4
, hls-graph
, hls-plugin-api >=1.1 && <1.3
, lsp
, text
, unordered-containers

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
11 changes: 10 additions & 1 deletion plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ library
, base >=4.12 && <5
, filepath
, ghc
, ghc-api-compat
, ghc-boot-th
, ghcide >=1.2 && <1.5
, hls-plugin-api >=1.1 && <1.3
Expand All @@ -34,6 +33,16 @@ library

default-language: Haskell2010

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

test-suite tests
type: exitcode-stdio-1.0
default-language: Haskell2010
Expand Down
11 changes: 10 additions & 1 deletion plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ library
, directory
, extra
, ghc
, ghc-api-compat
, ghcide >=1.2 && <1.5
, hashable
, hls-plugin-api >=1.1 && <1.3
Expand All @@ -33,6 +32,16 @@ library
, transformers
, unordered-containers

if impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc > 8.10.5) && impl(ghc < 9)
build-depends:
ghc-api-compat ==8.10.6
else
build-depends:
ghc-api-compat ==8.6

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
4 changes: 1 addition & 3 deletions stack-8.10.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ extra-deps:
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.6
- ghc-check-0.5.0.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
Expand Down
4 changes: 1 addition & 3 deletions stack-8.10.5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ extra-deps:
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.5
- fourmolu-0.3.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.10.5
- ghc-check-0.5.0.4
- ghc-exactprint-0.6.4
- ghc-source-gen-0.4.1.0
Expand Down
4 changes: 1 addition & 3 deletions stack-8.6.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ extra-deps:
- floskell-0.10.4
- fourmolu-0.3.0.0
- fuzzy-0.1.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.6
- ghc-check-0.5.0.4
- ghc-events-0.13.0
- ghc-exactprint-0.6.4
Expand Down
4 changes: 1 addition & 3 deletions stack-8.6.5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ extra-deps:
- floskell-0.10.4
- fourmolu-0.3.0.0
- fuzzy-0.1.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.6
- ghc-check-0.5.0.4
- ghc-events-0.13.0
- ghc-exactprint-0.6.4
Expand Down
4 changes: 1 addition & 3 deletions stack-8.8.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ extra-deps:
- constrained-dynamic-0.1.0.0
- floskell-0.10.4
- fourmolu-0.3.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.6
- ghc-check-0.5.0.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
Expand Down
4 changes: 1 addition & 3 deletions stack-8.8.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ extra-deps:
- constrained-dynamic-0.1.0.0
- floskell-0.10.4
- fourmolu-0.3.0.0
- # ghc-api-compat-8.6
github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
- ghc-api-compat-8.6
- ghc-check-0.5.0.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
Expand Down
3 changes: 0 additions & 3 deletions stack-9.0.1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ extra-deps:
commit: b6245884ae83e00dd2b5261762549b37390179f8
# https://github.com/lspitzner/czipwith/pull/2

- github: hsyl20/ghc-api-compat
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15

- github: anka-213/th-extras
commit: 57a97b4df128eb7b360e8ab9c5759392de8d1659
# https://github.com/mokus0/th-extras/pull/8
Expand Down

0 comments on commit 7a2730e

Please sign in to comment.