Skip to content

Commit

Permalink
Remove ghc-api source snapshot (#2156)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@pepeiborra
pepeiborra committed Sep 7, 2021
1 parent 16b4030 commit 0ccd6d7
Show file tree
Hide file tree
Showing 20 changed files with 156 additions and 50 deletions.
7 changes: 1 addition & 6 deletions cabal-ghc901.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ source-repository-package
tag: 9b1445ab5efcabfad54043fc9b8e50e9d8c5bbf3
-- https://github.com/mpickering/hie-bios/pull/285

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 All @@ -75,7 +70,7 @@ source-repository-package

write-ghc-environment-files: never

index-state: 2021-08-12T12:00:38Z
index-state: 2021-09-06T12:12:22Z

constraints:
-- These plugins doesn't work on GHC9 yet
Expand Down
9 changes: 1 addition & 8 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,13 @@ 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-09-06T12:12:22Z

constraints:
hyphenation +embed


allow-newer:
-- for shake-bench
Chart-diagrams:diagrams-core,
Expand Down
17 changes: 16 additions & 1 deletion ghcide/ghcide.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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.8.0,
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
Expand All @@ -110,6 +109,22 @@ library
build-depends:
unix

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

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

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

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

Expand Down
17 changes: 16 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,22 @@ library
, text
, unordered-containers

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

if os(windows)
build-depends: Win32

Expand Down
17 changes: 16 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,22 @@ library
default-language: Haskell2010
default-extensions: DataKinds

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

test-suite tests
type: exitcode-stdio-1.0
default-language: Haskell2010
Expand Down
17 changes: 16 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,22 @@ library
, text
, transformers

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
17 changes: 16 additions & 1 deletion plugins/hls-eval-plugin/hls-eval-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ library
, extra
, filepath
, ghc
, ghc-api-compat
, ghc-boot-th
, ghc-paths
, ghcide >=1.2 && <1.5
Expand All @@ -83,6 +82,22 @@ library
, unliftio
, unordered-containers

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

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

Expand Down
17 changes: 16 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,29 @@ 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.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
16 changes: 16 additions & 0 deletions plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,22 @@ library

default-language: Haskell2010

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

test-suite tests
type: exitcode-stdio-1.0
default-language: Haskell2010
Expand Down
17 changes: 16 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,22 @@ library
, transformers
, unordered-containers

if impl(ghc < 8.10.5)
build-depends:
ghc-api-compat ==8.6
elif impl(ghc == 8.10.5)
build-depends:
ghc-api-compat ==8.10.5
elif impl(ghc == 8.10.6)
build-depends:
ghc-api-compat ==8.10.6
elif impl(ghc == 8.10.7)
build-depends:
ghc-api-compat ==8.10.7
elif impl(ghc == 9.0.1)
build-depends:
ghc-api-compat ==9.0.1

default-language: Haskell2010
default-extensions:
DataKinds
Expand Down
4 changes: 1 addition & 3 deletions stack-8.10.2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,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.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,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.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,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-source-gen-0.4.1.0
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 @@ -39,9 +39,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 @@ -44,9 +44,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 @@ -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.8.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,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
Loading

0 comments on commit 0ccd6d7

Please sign in to comment.