diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 86f1deaa1f..4ef97612d0 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 @@ -66,7 +61,7 @@ source-repository-package write-ghc-environment-files: never -index-state: 2021-08-30T20:52:40Z +index-state: 2021-09-06T12:12:22Z constraints: -- These plugins doesn't work on GHC9 yet diff --git a/cabal.project b/cabal.project index 446a3ee956..d56c8d2189 100644 --- a/cabal.project +++ b/cabal.project @@ -31,20 +31,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, diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index c9c815a197..ca358d012d 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,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 diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 83355be7f4..8dd9e26a0d 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,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 diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal index f58005a4a6..fee9ceed11 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,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 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..140f547c95 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,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 diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index ad2ddd189b..ee34a4525f 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,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 diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal index 204c21864a..c9ba87be6f 100644 --- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal +++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal @@ -61,7 +61,6 @@ library , extra , filepath , ghc - , ghc-api-compat , ghc-boot-th , ghc-paths , ghcide >=1.2 && <1.5 @@ -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 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..98961ad2f5 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,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 + 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..49c3de1656 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,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 diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 4416f46037..74ddd52caf 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,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 diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index 39472406a0..13663cba29 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.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.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.4.yaml b/stack-8.10.4.yaml index ea43367c51..f00ff4d014 100644 --- a/stack-8.10.4.yaml +++ b/stack-8.10.4.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-source-gen-0.4.1.0 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.10.7.yaml b/stack-8.10.7.yaml index 928a3d29ef..3959b71d80 100644 --- a/stack-8.10.7.yaml +++ b/stack-8.10.7.yaml @@ -35,7 +35,7 @@ extra-deps: - bytestring-encoding-0.1.1.0@sha256:1c3b97eb6345fd7153006211c8272215cd78bb0cf440c41185290822f1e3f2c2,1738 - data-tree-print-0.1.0.2@sha256:d845e99f322df70e0c06d6743bf80336f5918d5423498528beb0593a2afc1703,1620 - floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803 - - ghc-api-compat-8.10.6@sha256:cde370b1b4c8a090de1ba6a8e27f65def9af43ca88710b412a6545b876568626,3324 + - ghc-api-compat-8.10.7 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417 - hiedb-0.4.0.0@sha256:b6dadd5cefc8c1052bc4b29144f616ca9c22e863a96d8e447d66a4d32c96fd4a,2987 - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998 @@ -55,9 +55,6 @@ extra-deps: # - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642 # - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154 -# for ghc-api-compat-8.10.6 -allow-newer: true - configure-options: ghcide: - --disable-library-for-ghci 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..5e71865dac 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -37,6 +37,7 @@ extra-deps: - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657 - dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147 - floskell-0.10.5 +- ghc-api-compat-9.0.1 - ghc-source-gen-0.4.1.0 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417 - hie-bios-0.7.6 @@ -59,9 +60,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