diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 86f1deaa1f..a3c4d38784 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -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 diff --git a/cabal.project b/cabal.project index 446a3ee956..a9f568f5d6 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index c9c815a197..f955c0b3d9 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -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, @@ -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 diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 83355be7f4..c0a323a045 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -338,7 +338,6 @@ executable haskell-language-server , cryptohash-sha1 , deepseq , ghc - , ghc-api-compat , ghc-boot-th , ghcide , hashable @@ -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 diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal index f58005a4a6..57fe9ab57e 100644 --- a/hls-plugin-api/hls-plugin-api.cabal +++ b/hls-plugin-api/hls-plugin-api.cabal @@ -44,7 +44,6 @@ library , Diff ^>=0.4.0 , dlist , ghc - , ghc-api-compat , hashable , hls-graph ^>=1.4 , hslogger @@ -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 diff --git a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal index d2c604e9d0..724692b331 100644 --- a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal +++ b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal @@ -27,7 +27,6 @@ library , containers , extra , ghc - , ghc-api-compat , ghcide ^>=1.4.1 , hiedb , hls-plugin-api ^>=1.2 @@ -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 diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index ad2ddd189b..54687670f3 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -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 @@ -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 diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index c33312678a..74cd9065db 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -19,7 +19,6 @@ library , containers , deepseq , ghc - , ghc-api-compat , ghcide ^>=1.4 , hls-graph , hls-plugin-api >=1.1 && <1.3 @@ -27,6 +26,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 + default-language: Haskell2010 default-extensions: DataKinds diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal index 496493203c..3eca837a71 100644 --- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal +++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal @@ -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 @@ -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 diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 4416f46037..71f26f8103 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -21,7 +21,6 @@ library , directory , extra , ghc - , ghc-api-compat , ghcide >=1.2 && <1.5 , hashable , hls-plugin-api >=1.1 && <1.3 @@ -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 diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index f75339cd27..a24c3512d3 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -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 diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml index 591bb24c58..b97fc70e81 100644 --- a/stack-8.10.5.yaml +++ b/stack-8.10.5.yaml @@ -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 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 0104e76d85..82c9b6628b 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -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 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 13a5a41289..51d4473532 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -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 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 85983a25d4..e1fc082b96 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -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 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index ff7a7d0dfe..3742c83f56 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -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 diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 133e11420d..385a3be711 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -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