From f01cff0f2ab5fc753e5f2dd5d77e1429652fbbd6 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Mon, 18 Apr 2022 12:46:11 +0530 Subject: [PATCH 1/4] Prepare 1.7.0.0 --- ChangeLog.md | 176 ++++++++++++++++++ bindist/ghcs | 3 + ghcide/ghcide.cabal | 8 +- haskell-language-server.cabal | 46 ++--- hls-graph/hls-graph.cabal | 2 +- hls-plugin-api/hls-plugin-api.cabal | 4 +- hls-test-utils/hls-test-utils.cabal | 4 +- .../hls-alternate-number-format-plugin.cabal | 4 +- .../hls-brittany-plugin.cabal | 4 +- .../hls-call-hierarchy-plugin.cabal | 4 +- .../hls-change-type-signature-plugin.cabal | 4 +- .../hls-class-plugin/hls-class-plugin.cabal | 6 +- plugins/hls-eval-plugin/hls-eval-plugin.cabal | 6 +- .../hls-explicit-imports-plugin.cabal | 6 +- .../hls-floskell-plugin.cabal | 4 +- .../hls-fourmolu-plugin.cabal | 6 +- .../hls-haddock-comments-plugin.cabal | 4 +- .../hls-hlint-plugin/hls-hlint-plugin.cabal | 6 +- .../hls-module-name-plugin.cabal | 6 +- .../hls-ormolu-plugin/hls-ormolu-plugin.cabal | 4 +- .../hls-pragmas-plugin.cabal | 4 +- .../hls-qualify-imported-names-plugin.cabal | 4 +- .../hls-refine-imports-plugin.cabal | 8 +- .../hls-rename-plugin/hls-rename-plugin.cabal | 4 +- .../hls-retrie-plugin/hls-retrie-plugin.cabal | 6 +- .../hls-selection-range-plugin.cabal | 4 +- .../hls-splice-plugin/hls-splice-plugin.cabal | 4 +- .../hls-stylish-haskell-plugin.cabal | 6 +- .../hls-tactics-plugin.cabal | 6 +- shake-bench/shake-bench.cabal | 2 +- 30 files changed, 267 insertions(+), 88 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index dd12e99a7a..874cfd7809 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,181 @@ # Changelog for haskell-language-server +## 1.7.0.0 + +- Distribute dynamically linked binaries for HLS to avoid statically linking against GLIBC + and system libraries, and to avoid unpredictable failures due to subtle differences + between the GHC used to compile HLS and the GHC installed on the users machine + (@hasufell, #2675, #2431) + +- Improved recompilation avoidance in projects that make use of Template Haskell (#2316). See + the [blog post](https://well-typed.com/blog/2022/04/hls-performance/) for more details. + This release includes the `avoid-recompile` set of commits described in the blog post. + +- Support for GHC 9.2.2 + +- Removal of HLS installer scripts as mentioned by the deprecation notice last release (#2773) + +- Many more improvements and bug fixed thanks to our contributors! + +### Pull requests merged for 1.6.1.1 + +- Restore concise type variables in ghc-9.2 +([#2828](https://github.com/haskell/haskell-language-server/pull/2828)) by @July541 +- Should no related code lens if the module name is correct +([#2826](https://github.com/haskell/haskell-language-server/pull/2826)) by @July541 +- Bump cachix/install-nix-action from 16 to 17 +([#2823](https://github.com/haskell/haskell-language-server/pull/2823)) by @dependabot[bot] +- Bump actions/upload-artifact from 2 to 3 +([#2822](https://github.com/haskell/haskell-language-server/pull/2822)) by @dependabot[bot] +- Bump actions/download-artifact from 2 to 3 +([#2821](https://github.com/haskell/haskell-language-server/pull/2821)) by @dependabot[bot] +- bench: Add more metrics +([#2814](https://github.com/haskell/haskell-language-server/pull/2814)) by @wz1000 +- Enable rename plugin +([#2809](https://github.com/haskell/haskell-language-server/pull/2809)) by @OliverMadine +- Fix `cabal install` commands for local HLS build in docs +([#2807](https://github.com/haskell/haskell-language-server/pull/2807)) by @9999years +- Bump actions/cache from 2 to 3 +([#2806](https://github.com/haskell/haskell-language-server/pull/2806)) by @dependabot[bot] +- [hls-graph] Optimise waitConcurrently +([#2805](https://github.com/haskell/haskell-language-server/pull/2805)) by @pepeiborra +- [bench] track changes to hls-* projects +([#2803](https://github.com/haskell/haskell-language-server/pull/2803)) by @pepeiborra +- Fix Show instance +([#2802](https://github.com/haskell/haskell-language-server/pull/2802)) by @pepeiborra +- Provide all format suggestions in AlternatFormat Code Action +([#2790](https://github.com/haskell/haskell-language-server/pull/2790)) by @drsooch +- Avoid race conditions with VFS and VFS versions +([#2789](https://github.com/haskell/haskell-language-server/pull/2789)) by @wz1000 +- Don't show the redundant space +([#2788](https://github.com/haskell/haskell-language-server/pull/2788)) by @July541 +- Target GHC 9.2.2 +([#2787](https://github.com/haskell/haskell-language-server/pull/2787)) by @pepeiborra +- Allow import all constructors +([#2782](https://github.com/haskell/haskell-language-server/pull/2782)) by @July541 +- Customizable TH warning +([#2781](https://github.com/haskell/haskell-language-server/pull/2781)) by @pepeiborra +- Fix #2693 +([#2780](https://github.com/haskell/haskell-language-server/pull/2780)) by @wz1000 +- Add Gentoo installation details +([#2778](https://github.com/haskell/haskell-language-server/pull/2778)) by @paul-jewell +- Eval plugin: mark exceptions +([#2775](https://github.com/haskell/haskell-language-server/pull/2775)) by @xsebek +- Fix 2 space leaks +([#2774](https://github.com/haskell/haskell-language-server/pull/2774)) by @pepeiborra +- Delete HLS installer scripts +([#2773](https://github.com/haskell/haskell-language-server/pull/2773)) by @fendor +- Purge some more hslogger +([#2770](https://github.com/haskell/haskell-language-server/pull/2770)) by @michaelpj +- Abbreviate explicit import code lenses +([#2769](https://github.com/haskell/haskell-language-server/pull/2769)) by @michaelpj +- Review masking and add traces when things don't cancel timely +([#2768](https://github.com/haskell/haskell-language-server/pull/2768)) by @pepeiborra +- Upgrade to hie-bios 0.9.1 +([#2766](https://github.com/haskell/haskell-language-server/pull/2766)) by @fendor +- Avoid extra parens for wildcard type signature +([#2764](https://github.com/haskell/haskell-language-server/pull/2764)) by @xsebek +- Add an option to run Fourmolu via the CLI interface of a separate binary, rather than the bundled library +([#2763](https://github.com/haskell/haskell-language-server/pull/2763)) by @georgefst +- Fix Change Type Signature Plugin test suite for 9.2.1 +([#2761](https://github.com/haskell/haskell-language-server/pull/2761)) by @drsooch +- Bump actions/checkout from 2 to 3 +([#2759](https://github.com/haskell/haskell-language-server/pull/2759)) by @dependabot[bot] +- Refactor LSP logger and log via window/logMessage also +([#2758](https://github.com/haskell/haskell-language-server/pull/2758)) by @michaelpj +- Fix the tower of Babel +([#2757](https://github.com/haskell/haskell-language-server/pull/2757)) by @hasufell +- Implement cycle detection in hls-graph +([#2756](https://github.com/haskell/haskell-language-server/pull/2756)) by @pepeiborra +- Adjust rendering of error logs and drop unneeded MonadUnliftIO instance +([#2755](https://github.com/haskell/haskell-language-server/pull/2755)) by @pepeiborra +- Estimate file versions safely +([#2753](https://github.com/haskell/haskell-language-server/pull/2753)) by @pepeiborra +- Fix test failure for AlternateNumberFormat +([#2752](https://github.com/haskell/haskell-language-server/pull/2752)) by @drsooch +- LSP window message log recorder +([#2750](https://github.com/haskell/haskell-language-server/pull/2750)) by @pepeiborra +- Fix FreeBSD bindist build +([#2748](https://github.com/haskell/haskell-language-server/pull/2748)) by @hasufell +- Improve bindist makefile +([#2746](https://github.com/haskell/haskell-language-server/pull/2746)) by @hasufell +- Fix flake.lock +([#2743](https://github.com/haskell/haskell-language-server/pull/2743)) by @michaelpj +- Add failing test for variables in hovers +([#2742](https://github.com/haskell/haskell-language-server/pull/2742)) by @michaelpj +- Update Define Function Code Action to have knowledge of comments +([#2740](https://github.com/haskell/haskell-language-server/pull/2740)) by @drsooch +- Upgrade to hie-bios 0.9.0 +([#2738](https://github.com/haskell/haskell-language-server/pull/2738)) by @fendor +- Track file versions accurately. +([#2735](https://github.com/haskell/haskell-language-server/pull/2735)) by @wz1000 +- Fix hls-class-plugin on ghc-9.2 +([#2733](https://github.com/haskell/haskell-language-server/pull/2733)) by @July541 +- Bump actions/github-script from 2 to 6 +([#2730](https://github.com/haskell/haskell-language-server/pull/2730)) by @dependabot[bot] +- Delete the Telemetry log level +([#2727](https://github.com/haskell/haskell-language-server/pull/2727)) by @michaelpj +- Tone down logging of plugin rules +([#2723](https://github.com/haskell/haskell-language-server/pull/2723)) by @pepeiborra +- Troubleshooting: GHC 9.2 partial support +([#2722](https://github.com/haskell/haskell-language-server/pull/2722)) by @andys8 +- Remove `getHspecFormattedConfig` which is no longer used +([#2721](https://github.com/haskell/haskell-language-server/pull/2721)) by @hololeap +- Fix crash for non-LSP modes wrt #2627 +([#2719](https://github.com/haskell/haskell-language-server/pull/2719)) by @hasufell +- Wingman: Don't use keywords for variable names +([#2717](https://github.com/haskell/haskell-language-server/pull/2717)) by @isovector +- Expose DisplayTHWarning (backport #2712) +([#2714](https://github.com/haskell/haskell-language-server/pull/2714)) by @mergify[bot] +- Send LSP error when GHC cannot be found +([#2713](https://github.com/haskell/haskell-language-server/pull/2713)) by @hasufell +- Expose DisplayTHWarning +([#2712](https://github.com/haskell/haskell-language-server/pull/2712)) by @pepeiborra +- Improve wrapper cradle errors +([#2711](https://github.com/haskell/haskell-language-server/pull/2711)) by @hasufell +- Fix min bound for ghc-exactprint dependency in hls-class-plugin +([#2710](https://github.com/haskell/haskell-language-server/pull/2710)) by @pepeiborra +- Remove duplicate help messages & format CRLF to LF +([#2709](https://github.com/haskell/haskell-language-server/pull/2709)) by @July541 +- Add @July541 for call-hierarchy-plugin +([#2708](https://github.com/haskell/haskell-language-server/pull/2708)) by @July541 +- Fix releasing +([#2707](https://github.com/haskell/haskell-language-server/pull/2707)) by @hasufell +- Print info message when ignoring a file due to a none cradle +([#2701](https://github.com/haskell/haskell-language-server/pull/2701)) by @ThomasCrevoisier +- fix: handle comma in extend import list with ghc 9.2 +([#2697](https://github.com/haskell/haskell-language-server/pull/2697)) by @guibou +- Build Alternate Number Format Plugin with GHC 9.2 +([#2696](https://github.com/haskell/haskell-language-server/pull/2696)) by @drsooch +- Optionally publish packages definitely in the hackage workflow +([#2689](https://github.com/haskell/haskell-language-server/pull/2689)) by @jneira +- Set -dynamic in cabal.project +([#2688](https://github.com/haskell/haskell-language-server/pull/2688)) by @jneira +- Multi component issues in GHC 9.2 +([#2687](https://github.com/haskell/haskell-language-server/pull/2687)) by @pepeiborra +- Fix flaky boot def test +([#2686](https://github.com/haskell/haskell-language-server/pull/2686)) by @eddiemundo +- Fix typos in troubleshooting.md +([#2680](https://github.com/haskell/haskell-language-server/pull/2680)) by @visortelle +- Add pre-commit hook for cleaning up mixed-line endings +([#2679](https://github.com/haskell/haskell-language-server/pull/2679)) by @drsooch +- Add a test for #2673 +([#2676](https://github.com/haskell/haskell-language-server/pull/2676)) by @pepeiborra +- Implement distribution of dynamic builds +([#2675](https://github.com/haskell/haskell-language-server/pull/2675)) by @hasufell +- Restore eval plugin build for GHC 9.2 +([#2669](https://github.com/haskell/haskell-language-server/pull/2669)) by @guibou +- Change Type Signature Plugin +([#2660](https://github.com/haskell/haskell-language-server/pull/2660)) by @drsooch +- Nix flake fix dev shells +([#2655](https://github.com/haskell/haskell-language-server/pull/2655)) by @guibou +- Speed up fuzzy search +([#2639](https://github.com/haskell/haskell-language-server/pull/2639)) by @Bodigrim +- Improve logging +([#2558](https://github.com/haskell/haskell-language-server/pull/2558)) by @eddiemundo +- Improve recompilation avoidance in the presence of TH +([#2316](https://github.com/haskell/haskell-language-server/pull/2316)) by @wz1000 + ## 1.6.1.1 (*only hackage release*) - Release to update haskell-language-server.cabal in hackage, setting the build for the executable component as dynamically linked diff --git a/bindist/ghcs b/bindist/ghcs index c230e6d25e..32cfc187ed 100644 --- a/bindist/ghcs +++ b/bindist/ghcs @@ -1,3 +1,6 @@ +8.6.5,cabal.project +8.8.4,cabal.project 8.10.7,cabal.project 9.0.2,cabal-ghc90.project 9.2.1,cabal-ghc92.project +9.2.2,cabal-ghc92.project diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index b34170e68c..aba7d1eb3d 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -2,7 +2,7 @@ cabal-version: 2.4 build-type: Simple category: Development name: ghcide -version: 1.6.0.1 +version: 1.7.0.0 license: Apache-2.0 license-file: LICENSE author: Digital Asset and Ghcide contributors @@ -13,7 +13,7 @@ description: A library for building Haskell IDE's on top of the GHC API. homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme bug-reports: https://github.com/haskell/haskell-language-server/issues -tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1 || == 9.0.2 || == 9.2.1 +tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1 || == 9.0.2 || == 9.2.1 || == 9.2.2 extra-source-files: README.md CHANGELOG.md test/data/**/*.project test/data/**/*.cabal @@ -60,7 +60,7 @@ library haddock-library >= 1.8 && < 1.11, hashable, hie-compat ^>= 0.2.0.0, - hls-plugin-api ^>= 1.2.0.2 || ^>= 1.3, + hls-plugin-api ^>= 1.4, lens, list-t, hiedb == 0.4.1.*, @@ -79,7 +79,7 @@ library rope-utf16-splay, safe, safe-exceptions, - hls-graph ^>= 1.6, + hls-graph ^>= 1.7, sorted-list, sqlite-simple, stm, diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index e1fe142e93..28e2ddbcc3 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 category: Development name: haskell-language-server -version: 1.6.1.1 +version: 1.7.0.0 synopsis: LSP server for GHC description: Please see the README on GitHub at @@ -71,12 +71,12 @@ library , cryptohash-sha1 , data-default , ghc - , ghcide ^>=1.6 + , ghcide ^>=1.7 , githash , lsp , hie-bios , hiedb - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , optparse-applicative , optparse-simple , process @@ -225,42 +225,42 @@ common example-plugins common class if flag(class) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) - build-depends: hls-class-plugin ^>=1.0.0.1 + build-depends: hls-class-plugin ^>= 1.0 cpp-options: -Dclass common callHierarchy if flag(callHierarchy) - build-depends: hls-call-hierarchy-plugin ^>=1.0.0.0 + build-depends: hls-call-hierarchy-plugin ^>= 1.0 cpp-options: -DcallHierarchy common haddockComments if flag(haddockComments) - build-depends: hls-haddock-comments-plugin ^>=1.0.0.1 + build-depends: hls-haddock-comments-plugin ^>= 1.0 cpp-options: -DhaddockComments common eval if flag(eval) - build-depends: hls-eval-plugin ^>=1.2.0.0 + build-depends: hls-eval-plugin ^>= 1.2 cpp-options: -Deval common importLens if flag(importLens) - build-depends: hls-explicit-imports-plugin ^>=1.0.0.1 + build-depends: hls-explicit-imports-plugin ^>= 1.1 cpp-options: -DimportLens common refineImports if flag(refineImports) - build-depends: hls-refine-imports-plugin ^>=1.0.0.0 + build-depends: hls-refine-imports-plugin ^>=1.0 cpp-options: -DrefineImports common rename if flag(rename) - build-depends: hls-rename-plugin ^>= 1.0.0.0 + build-depends: hls-rename-plugin ^>= 1.0 cpp-options: -Drename common retrie if flag(retrie) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) - build-depends: hls-retrie-plugin ^>=1.0.0.1 + build-depends: hls-retrie-plugin ^>= 1.0 cpp-options: -Dretrie common tactic @@ -270,17 +270,17 @@ common tactic common hlint if flag(hlint) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) - build-depends: hls-hlint-plugin ^>=1.0.0.2 + build-depends: hls-hlint-plugin ^>= 1.0 cpp-options: -Dhlint common moduleName if flag(moduleName) - build-depends: hls-module-name-plugin ^>=1.0.0.0 + build-depends: hls-module-name-plugin ^>= 1.0 cpp-options: -DmoduleName common pragmas if flag(pragmas) - build-depends: hls-pragmas-plugin ^>=1.0.0.0 + build-depends: hls-pragmas-plugin ^>= 1.0 cpp-options: -Dpragmas common splice @@ -290,49 +290,49 @@ common splice common alternateNumberFormat if flag(alternateNumberFormat) - build-depends: hls-alternate-number-format-plugin ^>=1.1.0.0 + build-depends: hls-alternate-number-format-plugin ^>= 1.1 cpp-options: -DalternateNumberFormat common qualifyImportedNames if flag(qualifyImportedNames) - build-depends: hls-qualify-imported-names-plugin ^>=1.0.0.0 + build-depends: hls-qualify-imported-names-plugin ^>=1.0 cpp-options: -DqualifyImportedNames common selectionRange if flag(selectionRange) - build-depends: hls-selection-range-plugin ^>=1.0.0.0 + build-depends: hls-selection-range-plugin ^>= 1.0 cpp-options: -DselectionRange common changeTypeSignature if flag(changeTypeSignature) - build-depends: hls-change-type-signature-plugin ^>=1.0.0.0 + build-depends: hls-change-type-signature-plugin ^>= 1.0 cpp-options: -DchangeTypeSignature -- formatters common floskell if flag(floskell) - build-depends: hls-floskell-plugin ^>=1.0.0.0 + build-depends: hls-floskell-plugin ^>= 1.0 cpp-options: -Dfloskell common fourmolu if flag(fourmolu) - build-depends: hls-fourmolu-plugin ^>=1.0.0.0 + build-depends: hls-fourmolu-plugin ^>= 1.0 cpp-options: -Dfourmolu common ormolu if flag(ormolu) - build-depends: hls-ormolu-plugin ^>=1.0.0.0 + build-depends: hls-ormolu-plugin ^>= 1.0 cpp-options: -Dormolu common stylishHaskell if flag(stylishHaskell) && (impl(ghc < 9.0.1) || flag(ignore-plugins-ghc-bounds)) - build-depends: hls-stylish-haskell-plugin ^>=1.0.0.0 + build-depends: hls-stylish-haskell-plugin ^>= 1.0 cpp-options: -DstylishHaskell common brittany if flag(brittany) && (impl(ghc < 9.0.2) || flag(ignore-plugins-ghc-bounds)) - build-depends: hls-brittany-plugin ^>=1.0.0.1 + build-depends: hls-brittany-plugin ^>= 1.0 cpp-options: -Dbrittany executable haskell-language-server diff --git a/hls-graph/hls-graph.cabal b/hls-graph/hls-graph.cabal index 0d813a4306..c9865099f3 100644 --- a/hls-graph/hls-graph.cabal +++ b/hls-graph/hls-graph.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-graph -version: 1.6.0.0 +version: 1.7.0.0 synopsis: Haskell Language Server internal graph API description: Please see the README on GitHub at diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal index 9a9c4bede4..d8e3b491d8 100644 --- a/hls-plugin-api/hls-plugin-api.cabal +++ b/hls-plugin-api/hls-plugin-api.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-plugin-api -version: 1.3.0.0 +version: 1.4.0.0 synopsis: Haskell Language Server API for plugin communication description: Please see the README on GitHub at @@ -45,7 +45,7 @@ library , extra , ghc , hashable - , hls-graph ^>= 1.6 + , hls-graph ^>= 1.7 , lens , lens-aeson , lsp >=1.4.0.0 && < 1.6 diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal index 199e874308..da28d16f03 100644 --- a/hls-test-utils/hls-test-utils.cabal +++ b/hls-test-utils/hls-test-utils.cabal @@ -41,9 +41,9 @@ library , directory , extra , filepath - , ghcide ^>=1.6 + , ghcide ^>=1.6 || ^>=1.7 , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lens , lsp ^>=1.4 , lsp-test ^>=0.14 diff --git a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal index 5831e1562c..76c733966b 100644 --- a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal +++ b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal @@ -26,10 +26,10 @@ library aeson , base >=4.12 && < 5 , containers - , ghcide ^>=1.6 + , ghcide ^>=1.6 || ^>=1.7 , ghc-boot-th , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.3 || ^>=1.4 , hie-compat , lens , lsp diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal index f740e811f8..da8cc68575 100644 --- a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal +++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal @@ -25,8 +25,8 @@ library , brittany >=0.13.1.0 && < 0.14.0.1 || > 0.14.0.1 , filepath , ghc-boot-th - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>= 1.6 || ^>= 1.7 + , hls-plugin-api ^>= 1.3 || ^>= 1.4 , lens , lsp-types , text 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 5305bef6cb..b6b0482835 100644 --- a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal +++ b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal @@ -30,9 +30,9 @@ library , containers , extra , ghc - , ghcide ^>=1.6 + , ghcide ^>= 1.6 || ^>= 1.7 , hiedb - , hls-plugin-api ^>=1.2 || ^>= 1.3 + , hls-plugin-api ^>= 1.2 || ^>= 1.3 || ^>= 1.4 , lens , lsp >=1.2.0.1 , sqlite-simple diff --git a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal index 25214d8bd7..9c317b3ed3 100644 --- a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal +++ b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal @@ -22,8 +22,8 @@ library hs-source-dirs: src build-depends: , base >=4.12 && < 5 - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp-types , regex-tdfa , syb diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index 877338c02f..47171eb98c 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-class-plugin -version: 1.0.2.0 +version: 1.0.3.0 synopsis: Class/instance management plugin for Haskell Language Server @@ -29,8 +29,8 @@ library , containers , ghc , ghc-exactprint >= 0.6.4 - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.7 + , hls-plugin-api ^>=1.4 , lens , lsp , text diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal index f8388fbd6e..8e67956ccb 100644 --- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal +++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-eval-plugin -version: 1.2.1.0 +version: 1.2.2.0 synopsis: Eval plugin for Haskell Language Server description: Please see the README on GitHub at @@ -66,10 +66,10 @@ library , ghc , ghc-boot-th , ghc-paths - , ghcide ^>=1.6 + , ghcide ^>=1.7 , hashable , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , lens , lsp , lsp-types 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 8061dd7148..f94922fd15 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: hls-explicit-imports-plugin -version: 1.0.2.0 +version: 1.1.0.0 synopsis: Explicit imports plugin for Haskell Language Server description: Please see the README on GitHub at @@ -24,9 +24,9 @@ library , containers , deepseq , ghc - , ghcide ^>=1.6 + , ghcide ^>=1.7 , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , lsp , text , unordered-containers diff --git a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal index 30ce747cc2..11a3d016bd 100644 --- a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal +++ b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal @@ -22,8 +22,8 @@ library build-depends: , base >=4.12 && <5 , floskell ^>=0.10 - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp-types , text , transformers diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index df2639a8d2..8d7ec5052d 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-fourmolu-plugin -version: 1.0.2.0 +version: 1.0.3.0 synopsis: Integration with the Fourmolu code formatter description: Please see the README on GitHub at @@ -26,8 +26,8 @@ library , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.5 , ghc , ghc-boot-th - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.7 + , hls-plugin-api ^>=1.4 , lens , lsp , process-extras diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index 0215590d11..8338495d13 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -29,8 +29,8 @@ library , containers , ghc , ghc-exactprint - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp-types , text , unordered-containers diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index efc1e9dc17..f7fb3916b4 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-hlint-plugin -version: 1.0.3.0 +version: 1.0.4.0 synopsis: Hlint integration plugin with Haskell Language Server description: Please see the README on GitHub at @@ -55,10 +55,10 @@ library , extra , filepath , ghc-exactprint >=0.6.3.4 - , ghcide ^>=1.6 + , ghcide ^>=1.7 , hashable , hlint - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , hslogger , lens , lsp diff --git a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal index 4c7f157681..5dc19d5f83 100644 --- a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal +++ b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-module-name-plugin -version: 1.0.1.0 +version: 1.0.2.0 synopsis: Module name plugin for Haskell Language Server description: Please see the README on GitHub at @@ -25,8 +25,8 @@ library , base >=4.12 && <5 , directory , filepath - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.7 + , hls-plugin-api ^>=1.4 , lsp , text , transformers diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal index a6aa5180dc..6cfc42b654 100644 --- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal +++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal @@ -24,8 +24,8 @@ library , filepath , ghc , ghc-boot-th - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lens , lsp , ormolu ^>=0.1.2 || ^>= 0.2 || ^>= 0.3 || ^>= 0.4 diff --git a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal index 0dae7d9be0..8c16147163 100644 --- a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal +++ b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal @@ -25,8 +25,8 @@ library , extra , fuzzy , ghc - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lens , lsp , text diff --git a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal index 76f65cad80..6e15e1abc2 100644 --- a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal +++ b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal @@ -26,9 +26,9 @@ library , containers , deepseq , ghc - , ghcide ^>=1.6 + , ghcide ^>=1.6 || ^>=1.7 , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp , text , unordered-containers diff --git a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal index 610c9aba13..98d36465e4 100644 --- a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal +++ b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-refine-imports-plugin -version: 1.0.1.0 +version: 1.0.2.0 synopsis: Refine imports plugin for Haskell Language Server description: Please see the README on GitHub at @@ -24,10 +24,10 @@ library , containers , deepseq , ghc - , ghcide ^>=1.6 - , hls-explicit-imports-plugin ^>=1.0.0.1 + , ghcide ^>=1.7 + , hls-explicit-imports-plugin ^>=1.1 , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , lsp , text , unordered-containers diff --git a/plugins/hls-rename-plugin/hls-rename-plugin.cabal b/plugins/hls-rename-plugin/hls-rename-plugin.cabal index 9b6b7576e9..3a709f2206 100644 --- a/plugins/hls-rename-plugin/hls-rename-plugin.cabal +++ b/plugins/hls-rename-plugin/hls-rename-plugin.cabal @@ -25,10 +25,10 @@ library , extra , ghc , ghc-exactprint - , ghcide ^>=1.6 + , ghcide ^>= 1.6 || ^>=1.7 , hashable , hiedb - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>= 1.3 || ^>=1.4 , lsp , lsp-types , mod diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index e051eaff39..3313ffe610 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: hls-retrie-plugin -version: 1.0.2.0 +version: 1.0.2.1 synopsis: Retrie integration plugin for Haskell Language Server description: Please see the README on GitHub at @@ -24,9 +24,9 @@ library , directory , extra , ghc - , ghcide ^>=1.6 + , ghcide ^>=1.7 , hashable - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , lsp , lsp-types , retrie >=0.1.1.0 diff --git a/plugins/hls-selection-range-plugin/hls-selection-range-plugin.cabal b/plugins/hls-selection-range-plugin/hls-selection-range-plugin.cabal index ef279e7b69..220e971359 100644 --- a/plugins/hls-selection-range-plugin/hls-selection-range-plugin.cabal +++ b/plugins/hls-selection-range-plugin/hls-selection-range-plugin.cabal @@ -32,8 +32,8 @@ library , aeson , base >=4.12 && <5 , containers - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp , transformers , mtl diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index d088dfe53c..33ce5be84c 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -38,8 +38,8 @@ library , foldl , ghc , ghc-exactprint - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.6 || ^>=1.7 + , hls-plugin-api ^>=1.3 || ^>=1.4 , lens , lsp , retrie diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal index 28d25087bb..835c601374 100644 --- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal +++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-stylish-haskell-plugin -version: 1.0.1.0 +version: 1.0.1.1 synopsis: Integration with the Stylish Haskell code formatter description: Please see the README on GitHub at @@ -24,8 +24,8 @@ library , filepath , ghc , ghc-boot-th - , ghcide ^>=1.6 - , hls-plugin-api ^>=1.3 + , ghcide ^>=1.7 + , hls-plugin-api ^>=1.4 , lsp-types , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14 , text diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal index 6696a1d8c7..135607a7c1 100644 --- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal +++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 category: Development name: hls-tactics-plugin -version: 1.6.1.0 +version: 1.6.2.0 synopsis: Wingman plugin for Haskell Language Server description: Please see the README on GitHub at @@ -82,9 +82,9 @@ library , ghc-boot-th , ghc-exactprint , ghc-source-gen ^>=0.4.1 - , ghcide ^>=1.6 + , ghcide ^>=1.7 , hls-graph - , hls-plugin-api ^>=1.3 + , hls-plugin-api ^>=1.4 , hyphenation , lens , lsp diff --git a/shake-bench/shake-bench.cabal b/shake-bench/shake-bench.cabal index 6068520485..68450dfe85 100644 --- a/shake-bench/shake-bench.cabal +++ b/shake-bench/shake-bench.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: shake-bench -version: 0.1.0.3 +version: 0.1.1.0 synopsis: Build rules for historical benchmarking license: Apache-2.0 license-file: LICENSE From 8d0550bd741092e0a659af76737da64894086701 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Tue, 19 Apr 2022 13:28:23 +0530 Subject: [PATCH 2/4] Remove references to `cabal-ghc921.project` It has been changed to `cabal-ghc92.project` --- .github/actions/setup-build/action.yml | 2 +- .gitlab-ci.yml | 2 +- docs/installation.md | 2 +- flake.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index b99b5e4089..ef07a3bf17 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -42,7 +42,7 @@ runs: echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV shell: bash - # This copy an alternative cabal-ghc${GHCVER}.project (for example cabal-ghc921.project) + # This copy an alternative cabal-ghc${GHCVER}.project (for example cabal-ghc92.project) # as main cabal-project, for not fully supported ghc versions # Needs to be before the caching step so that the cache can detect changes to the modified cabal.project file - name: Use possible modified `cabal.project` diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54941d616f..a8e5d14528 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: - GHC_VERSION: 9.0.2 CABAL_PROJECT: cabal-ghc90.project - GHC_VERSION: 9.2.2 - CABAL_PROJECT: cabal-ghc921.project + CABAL_PROJECT: cabal-ghc92.project workflow: rules: diff --git a/docs/installation.md b/docs/installation.md index 2b8faa8a65..59710c69be 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -36,7 +36,7 @@ ghcup compile hls -v 1.6.1.0 --ghc 8.10.7 --ghc 8.8.4 Use a different `cabal.project` for a GHC version: ``` -ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal-ghc921.project +ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal-ghc92.project ``` Check `ghcup compile hls --help` for a full list of compilation options. diff --git a/flake.nix b/flake.nix index 72a067a36c..1676dbed47 100644 --- a/flake.nix +++ b/flake.nix @@ -337,7 +337,7 @@ haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project"; haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project"; haskell-language-server-901-dev = mkDevShell ghc901 "cabal-ghc90.project"; - haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc921.project"; + haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project"; }; # Developement shell, haskell packages are also provided by nix @@ -346,7 +346,7 @@ haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project"; haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project"; haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project"; - haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc921.project"; + haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project"; }; allPackages = { From 032f19270173201118ddb99d4428bfc89cbfc806 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Tue, 19 Apr 2022 14:26:32 +0530 Subject: [PATCH 3/4] gitlab-ci: Add 9.2.1 job for windows 9.2.2 is broken (https://gitlab.haskell.org/ghc/ghc/-/issues/21196) --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8e5d14528..a677e435d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ variables: CABAL_PROJECT: cabal.project - GHC_VERSION: 9.0.2 CABAL_PROJECT: cabal-ghc90.project + - GHC_VERSION: 9.2.1 + CABAL_PROJECT: cabal-ghc92.project - GHC_VERSION: 9.2.2 CABAL_PROJECT: cabal-ghc92.project From 4592162001e82b99538b965257329046c11d862d Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Tue, 19 Apr 2022 15:09:12 +0530 Subject: [PATCH 4/4] Fix build on windows 9.2.2 --- .gitlab/ci.sh | 6 ++++++ .gitlab/test.sh | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 58a66ff6d5..aab4f68d94 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -47,6 +47,12 @@ esac case "$(uname)" in MSYS_*|MINGW*) + # workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196 + export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH" + ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin + cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin + cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin + ghc --info # Shorten binary names sed -i.bak -e 's/haskell-language-server/hls/g' \ -e 's/haskell_language_server/hls/g' \ diff --git a/.gitlab/test.sh b/.gitlab/test.sh index 5f08d97898..4260ca78b9 100644 --- a/.gitlab/test.sh +++ b/.gitlab/test.sh @@ -45,6 +45,18 @@ case "$(uname -s)" in ;; esac +case "$(uname)" in + MSYS_*|MINGW*) + # workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196 + export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH" + ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin + cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin + cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin + ghc --info + ;; + *) ;; +esac + # make sure out/ dir is gone, so build host rpaths don't # kick in (TODO: we should probably remove those) mv "$CI_PROJECT_DIR/out"/*.tar.xz .