Skip to content

Commit 30ab57a

Browse files
depressed-phodepressed-pho
committed
devel/haskell-language-server: update to haskell-language-server-2.9.0.0
## 2.9.0.0 - Bindists for GHC 9.10.1 by @wz1000, @jhrcek, @michaelpj - More hls-graph reliability improvements by @soulomoon - Refactoring of test suite runners by @soulomoon - Fixes in multiple home units support by @wz1000 ### Pull Requests - Fix quadratic memory usage in GetLocatedImports ([#4318](haskell/haskell-language-server#4318)) by @mpickering - Bump stack configs + CI to 9.6.5 and 9.8.2 ([#4316](haskell/haskell-language-server#4316)) by @jhrcek - Add support for Fourmolu 0.16 ([#4314](haskell/haskell-language-server#4314)) by @ brandonchinn178 - Code action to remove redundant record field import (fixes #4220) ([#4308](haskell/haskell-language-server#4308)) by @battermann - Use restricted monad for plugins (#4057) ([#4304](haskell/haskell-language-server#4304)) by @awjchen - 4301 we need to implement utility to wait for all runnning keys in hls graph done ([#4302](haskell/haskell-language-server#4302)) by @soulomoon - Call useWithStale instead of useWithStaleFast when calling ParseCabalFields ([#4294](haskell/haskell-language-server#4294)) by @VeryMilkyJoe - test: add test documenting #806 ([#4292](haskell/haskell-language-server#4292)) by @develop7 - ghcide: drop ghc-check and ghc-paths dependency ([#4291](haskell/haskell-language-server#4291)) by @wz1000 - Limit number of valid hole fits to 10 ([#4288](haskell/haskell-language-server#4288)) by @akshaymankar - Add common stanza to completion data ([#4286](haskell/haskell-language-server#4286)) by @VeryMilkyJoe - FindImports: ThisPkg means some home unit, not "this" unit ([#4284](haskell/haskell-language-server#4284)) by @wz1000 - Remove redudant absolutization in session loader ([#4280](haskell/haskell-language-server#4280)) by @soulomoon - Bump to new lsp versions ([#4279](haskell/haskell-language-server#4279)) by @michaelpj - Put more test code into pre-commit ([#4275](haskell/haskell-language-server#4275)) by @soulomoon - Delete library ghcide test utils ([#4274](haskell/haskell-language-server#4274)) by @soulomoon - Delete testUtil from ghcide-tests ([#4272](haskell/haskell-language-server#4272)) by @soulomoon - CI change, only run bench on performance label ([#4271](haskell/haskell-language-server#4271)) by @soulomoon - Migrate WatchedFileTests ([#4269](haskell/haskell-language-server#4269)) by @soulomoon - Migrate UnitTests ([#4268](haskell/haskell-language-server#4268)) by @soulomoon - Migrate SafeTests ([#4267](haskell/haskell-language-server#4267)) by @soulomoon - Migrate SymlinkTests ([#4266](haskell/haskell-language-server#4266)) by @soulomoon - Remove unused and outdated CHANGELOG files ([#4264](haskell/haskell-language-server#4264)) by @fendor - Enable cabal flaky test ([#4263](haskell/haskell-language-server#4263)) by @soulomoon - Migrate RootUriTests ([#4261](haskell/haskell-language-server#4261)) by @soulomoon - Migrate PreprocessorTests ([#4260](haskell/haskell-language-server#4260)) by @soulomoon - Migrate PluginSimpleTests ([#4259](haskell/haskell-language-server#4259)) by @soulomoon - Migrate ClientSettingsTests ([#4258](haskell/haskell-language-server#4258)) by @soulomoon - Unify critical session running in hls ([#4256](haskell/haskell-language-server#4256)) by @soulomoon - Bump cachix/cachix-action from 14 to 15 ([#4255](haskell/haskell-language-server#4255)) by @dependabot[bot] - Bump haskell-actions/setup from 2.7.2 to 2.7.3 ([#4254](haskell/haskell-language-server#4254)) by @dependabot[bot] - Bump haskell-actions/setup from 2.7.2 to 2.7.3 in /.github/actions/setup-build ([#4253](haskell/haskell-language-server#4253)) by @dependabot[bot] - Shorter file names completion ([#4252](haskell/haskell-language-server#4252)) by @VenInf - Fix progress start delay ([#4249](haskell/haskell-language-server#4249)) by @michaelpj - Bump cachix/install-nix-action from 26 to 27 ([#4245](haskell/haskell-language-server#4245)) by @dependabot[bot] - Bump haskell-actions/setup from 2.7.1 to 2.7.2 ([#4244](haskell/haskell-language-server#4244)) by @dependabot[bot] - Bump haskell-actions/setup from 2.7.1 to 2.7.2 in /.github/actions/setup-build ([#4243](haskell/haskell-language-server#4243)) by @dependabot[bot] - Enable test for #717 ([#4241](haskell/haskell-language-server#4241)) by @soulomoon - Remove Pepe from CODEOWNERS ([#4239](haskell/haskell-language-server#4239)) by @michaelpj - Fix resultBuilt(dirty mechanism) in hls-graph ([#4238](haskell/haskell-language-server#4238)) by @soulomoon - Support for 9.10 ([#4233](haskell/haskell-language-server#4233)) by @wz1000 - Refactor hls-test-util and reduce getCurrentDirectory after initilization ([#4231](haskell/haskell-language-server#4231)) by @soulomoon - [Migrate BootTests] part of #4173 Migrate ghcide tests to hls test utils ([#4227](haskell/haskell-language-server#4227)) by @soulomoon - Actually enable pedantic flag in ci flags job ([#4224](haskell/haskell-language-server#4224)) by @jhrcek - Cleanup cabal files, ghc compat code, fix ghc warnings ([#4222](haskell/haskell-language-server#4222)) by @jhrcek - Another attempt at using the lsp API for some progress reporting ([#4218](haskell/haskell-language-server#4218)) by @michaelpj - [Migrate diagnosticTests] part of #4173 Migrate ghcide tests to hls test utils ([#4207](haskell/haskell-language-server#4207)) by @soulomoon - Prepare release 2.8.0.0 ([#4191](haskell/haskell-language-server#4191)) by @wz1000 - Stabilize the build system by correctly house keeping the dirtykeys and rule values [flaky test #4185 #4093] ([#4190](haskell/haskell-language-server#4190)) by @soulomoon - hls-cabal-plugin: refactor context search to use `readFields` ([#4186](haskell/haskell-language-server#4186)) by @fendor - 3944 extend the properties api to better support nested configuration ([#3952](haskell/haskell-language-server#3952)) by @soulomoon ## 2.8.0.0 - Bindists for GHC 9.6.5 - New hls-notes plugin (#4126, @jvanbruegge) - Floskell, hlint and stylish-haskell plugins enabled for GHC 9.8 - Improvements for hls-graph increasing robustness (#4087, @soulomoon) - Improvements to multi-component support (#4096, #4109, #4179, @wz1000, @fendor) ### Pull Requests - Bump haskell-actions/setup from 2.7.0 to 2.7.1 ([#4189](haskell/haskell-language-server#4189)) by @dependabot[bot] - Bump haskell-actions/setup from 2.7.0 to 2.7.1 in /.github/actions/setup-build ([#4188](haskell/haskell-language-server#4188)) by @dependabot[bot] - Fix ghcdie-tests CI ([#4184](haskell/haskell-language-server#4184)) by @soulomoon - Fix ghc and hlint warnings, fix formatting ([#4181](haskell/haskell-language-server#4181)) by @jhrcek - Allow users to specify whether to use `cabal`'s multi-repl feature ([#4179](haskell/haskell-language-server#4179)) by @fendor - Improve parsing of import suggestions extending multiple multiline imports (fixes #4175) ([#4177](haskell/haskell-language-server#4177)) by @jhrcek - move ghcide-tests to haskell-language-server.cabal and make it depend on hls-test-utils ([#4176](haskell/haskell-language-server#4176)) by @soulomoon - enable ThreadId for when testing ([#4174](haskell/haskell-language-server#4174)) by @soulomoon - Drop Legacy Logger from Codebase ([#4171](haskell/haskell-language-server#4171)) by @fendor - get rid of the `unsafeInterleaveIO` at start up ([#4167](haskell/haskell-language-server#4167)) by @soulomoon - Remove EKG ([#4163](haskell/haskell-language-server#4163)) by @michaelpj - Mark plugins as not buildable if the flag is disabled ([#4160](haskell/haskell-language-server#4160)) by @michaelpj - Fix references to old CPP names in tests, update tests ([#4159](haskell/haskell-language-server#4159)) by @jhrcek - Bump haskell-actions/setup from 2.6.3 to 2.7.0 ([#4158](haskell/haskell-language-server#4158)) by @dependabot[bot] - Bump haskell-actions/setup from 2.6.3 to 2.7.0 in /.github/actions/setup-build ([#4157](haskell/haskell-language-server#4157)) by @dependabot[bot] - Remove dead code in ghcide and hls-graph for priority ([#4151](haskell/haskell-language-server#4151)) by @soulomoon - Bump haskell-actions/setup from 2.6.2 to 2.6.3 in /.github/actions/setup-build ([#4150](haskell/haskell-language-server#4150)) by @dependabot[bot] - Bump haskell-actions/setup from 2.6.2 to 2.6.3 ([#4149](haskell/haskell-language-server#4149)) by @dependabot[bot] - Run ExceptionTests in temporary directory ([#4146](haskell/haskell-language-server#4146)) by @fendor - hls-eval-plugin: Replicate #4139 ([#4140](haskell/haskell-language-server#4140)) by @mattapet - Update comment in refactor tests ([#4138](haskell/haskell-language-server#4138)) by @jhrcek - Update contact info in docs ([#4137](haskell/haskell-language-server#4137)) by @jhrcek - hls-notes-plugin: Do not error if no note is under the cursor ([#4136](haskell/haskell-language-server#4136)) by @jvanbruegge - improve logging in semantic tokens rule ([#4135](haskell/haskell-language-server#4135)) by @soulomoon - Bump softprops/action-gh-release from 1 to 2 ([#4133](haskell/haskell-language-server#4133)) by @dependabot[bot] - Bump cachix/install-nix-action from 25 to 26 ([#4132](haskell/haskell-language-server#4132)) by @dependabot[bot] - Use Set.member instead of Foldable.elem ([#4128](haskell/haskell-language-server#4128)) by @jhrcek - hls-notes-plugin: Initial implementation ([#4126](haskell/haskell-language-server#4126)) by @jvanbruegge - Enable floskell and hlint plugins for ghc 9.8 ([#4125](haskell/haskell-language-server#4125)) by @jhrcek - Integrate stylish-haskell into hls executable with ghc 9.8 ([#4124](haskell/haskell-language-server#4124)) by @jhrcek - Reduce usage of partial functions ([#4123](haskell/haskell-language-server#4123)) by @jhrcek - Benchmark: Enable 9.6, 9.8 ([#4118](haskell/haskell-language-server#4118)) by @soulomoon - Bump haskell-actions/setup from 2.6.1 to 2.6.2 in /.github/actions/setup-build ([#4116](haskell/haskell-language-server#4116)) by @dependabot[bot] - Bump haskell-actions/setup from 2.6.1 to 2.6.2 ([#4115](haskell/haskell-language-server#4115)) by @dependabot[bot] - eval: more robust way to extract comments from ParsedModule ([#4113](haskell/haskell-language-server#4113)) by @jhrcek - Improve isolation of build artefacts of test runs ([#4112](haskell/haskell-language-server#4112)) by @fendor - Improve handling of nonsense rename attempts ([#4111](haskell/haskell-language-server#4111)) by @jhrcek - Exit with non-zero exitcode if wrapper fails to launch ([#4110](haskell/haskell-language-server#4110)) by @fendor - Replace checkHomeUnitsClosed with a faster implementation ([#4109](haskell/haskell-language-server#4109)) by @wz1000 - Don't distribute gifs or plugin readmes ([#4107](haskell/haskell-language-server#4107)) by @fendor - Remove locale workaround for Module name that conatins non-ascii characters ([#4106](haskell/haskell-language-server#4106)) by @fendor - Track extra-source-files of plugins more accurately ([#4105](haskell/haskell-language-server#4105)) by @fendor - remove non-ascii name ([#4103](haskell/haskell-language-server#4103)) by @soulomoon - Add cabal-gild as a cabal file formatter plugin ([#4101](haskell/haskell-language-server#4101)) by @fendor - Remove more workarounds for GHCs < 9.2 (#4092) ([#4098](haskell/haskell-language-server#4098)) by @jhrcek - session-loader: Don't loop forever when we don't find a file in any multi component ([#4096](haskell/haskell-language-server#4096)) by @wz1000 - Prepare release 2.7.0.0 ([#4095](haskell/haskell-language-server#4095)) by @fendor - Remove more workarounds for GHCs < 9.0 ([#4092](haskell/haskell-language-server#4092)) by @jhrcek - Fix hls-graph: phantom dependencies invoke in branching deps (resolve #3423) ([#4087](haskell/haskell-language-server#4087)) by @soulomoon - Rename only if the current module compiles (#3799) ([#3848](haskell/haskell-language-server#3848)) by @sgillespie - Reintroduce ghc-lib flag for hlint plugin ([#3757](haskell/haskell-language-server#3757)) by @RaoulHC
1 parent d325533 commit 30ab57a

File tree

3 files changed

+382
-366
lines changed

3 files changed

+382
-366
lines changed

‎devel/haskell-language-server/Makefile

Lines changed: 119 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,30 @@
1-
# $NetBSD: Makefile,v 1.20 2024/11/14 22:19:21 wiz Exp $
1+
# $NetBSD: Makefile,v 1.21 2025/01/31 15:41:00 pho Exp $
22

3-
DISTNAME= haskell-language-server-2.7.0.0
3+
DISTNAME= haskell-language-server-2.9.0.0
44
PKGNAME= ${DISTNAME}
5-
PKGREVISION= 5
65
CATEGORIES= devel
76

87
MAINTAINER= pkgsrc-users@NetBSD.org
98
COMMENT= LSP server for GHC
109
LICENSE= apache-2.0
1110

1211
HASKELL_UNRESTRICT_DEPENDENCIES+= \
13-
Diff \
14-
lsp \
15-
lsp-types
12+
Diff
1613

1714
# HLS is built with optparse-applicative, and can generate shell completion
1815
# scripts automatically.
16+
.include "../../devel/hs-optparse-applicative/application.mk"
17+
OPTPARSE_APPLICATIVE_EXECUTABLES+= ghcide-bench
1918
OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server
2019
OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
21-
.include "../../devel/hs-optparse-applicative/application.mk"
2220

23-
#
24-
# These contains a lot of duplicate dependencies but it's intentional so
25-
# that we can easily maintain the list.
26-
#
2721
# lib:haskell-language-server
2822
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
2923
.include "../../devel/hs-data-default/buildlink3.mk"
3024
.include "../../misc/hs-extra/buildlink3.mk"
3125
.include "../../devel/hs-ghcide/buildlink3.mk"
3226
.include "../../devel/hs-githash/buildlink3.mk"
3327
.include "../../devel/hs-hie-bios/buildlink3.mk"
34-
.include "../../devel/hs-hiedb/buildlink3.mk"
3528
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
3629
.include "../../devel/hs-optparse-applicative/buildlink3.mk"
3730
.include "../../devel/hs-optparse-simple/buildlink3.mk"
@@ -44,17 +37,22 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
4437
.include "../../devel/hs-lsp-types/buildlink3.mk"
4538
.include "../../sysutils/hs-process-extras/buildlink3.mk"
4639

40+
# lib:hls-cabal-gild-plugin
41+
.include "../../devel/hs-ghcide/buildlink3.mk"
42+
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
43+
.include "../../devel/hs-lsp-types/buildlink3.mk"
44+
.include "../../sysutils/hs-process-extras/buildlink3.mk"
45+
4746
# lib:hls-cabal-plugin
4847
.include "../../misc/hs-extra/buildlink3.mk"
4948
.include "../../devel/hs-ghcide/buildlink3.mk"
5049
.include "../../devel/hs-hashable/buildlink3.mk"
51-
.include "../../devel/hs-hls-graph/buildlink3.mk"
5250
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
51+
.include "../../devel/hs-hls-graph/buildlink3.mk"
5352
.include "../../devel/hs-lens/buildlink3.mk"
5453
.include "../../devel/hs-lsp/buildlink3.mk"
5554
.include "../../devel/hs-lsp-types/buildlink3.mk"
5655
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
57-
.include "../../textproc/hs-text-rope/buildlink3.mk"
5856
.include "../../devel/hs-unordered-containers/buildlink3.mk"
5957

6058
# lib:hls-class-plugin
@@ -104,54 +102,55 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
104102
# lib:hls-rename-plugin
105103
.include "../../devel/hs-ghcide/buildlink3.mk"
106104
.include "../../devel/hs-hashable/buildlink3.mk"
107-
.include "../../devel/hs-hie-compat/buildlink3.mk"
108105
.include "../../devel/hs-hiedb/buildlink3.mk"
106+
.include "../../devel/hs-hie-compat/buildlink3.mk"
109107
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
110108
.include "../../devel/hs-lens/buildlink3.mk"
111-
.include "../../devel/hs-lsp/buildlink3.mk"
112109
.include "../../devel/hs-lsp-types/buildlink3.mk"
113110
.include "../../math/hs-mod/buildlink3.mk"
114111
.include "../../devel/hs-syb/buildlink3.mk"
115112
.include "../../devel/hs-unordered-containers/buildlink3.mk"
116113

114+
CONFIGURE_ARGS+= -f -retrie # Broken at the moment.
117115
# lib:hls-retrie-plugin
118-
.include "../../converters/hs-aeson/buildlink3.mk"
119-
.include "../../misc/hs-extra/buildlink3.mk"
120-
.include "../../devel/hs-ghcide/buildlink3.mk"
121-
.include "../../devel/hs-hashable/buildlink3.mk"
122-
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
123-
.include "../../devel/hs-lens/buildlink3.mk"
124-
.include "../../devel/hs-lsp/buildlink3.mk"
125-
.include "../../devel/hs-lsp-types/buildlink3.mk"
126-
.include "../../devel/retrie/buildlink3.mk"
127-
.include "../../devel/hs-safe-exceptions/buildlink3.mk"
128-
.include "../../devel/hs-unordered-containers/buildlink3.mk"
129-
116+
#.include "../../converters/hs-aeson/buildlink3.mk"
117+
#.include "../../misc/hs-extra/buildlink3.mk"
118+
#.include "../../devel/hs-ghcide/buildlink3.mk"
119+
#.include "../../devel/hs-hashable/buildlink3.mk"
120+
#.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
121+
#.include "../../devel/hs-lens/buildlink3.mk"
122+
#.include "../../devel/hs-lsp/buildlink3.mk"
123+
#.include "../../devel/hs-lsp-types/buildlink3.mk"
124+
#.include "../../devel/retrie/buildlink3.mk"
125+
#.include "../../devel/hs-safe-exceptions/buildlink3.mk"
126+
#.include "../../devel/hs-unordered-containers/buildlink3.mk"
127+
128+
CONFIGURE_ARGS+= -f -hlint # Broken at the moment.
130129
# lib:hls-hlint-plugin
131-
.include "../../converters/hs-aeson/buildlink3.mk"
132-
.include "../../devel/hs-apply-refact/buildlink3.mk"
133-
.include "../../devel/hs-ghc-lib-parser/buildlink3.mk"
134-
.include "../../devel/hs-ghc-lib-parser-ex/buildlink3.mk"
135-
.include "../../devel/hs-ghcide/buildlink3.mk"
136-
.include "../../devel/hs-hashable/buildlink3.mk"
137-
.include "../../devel/hlint/buildlink3.mk"
138-
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
139-
.include "../../devel/hs-lens/buildlink3.mk"
140-
.include "../../devel/hs-lsp/buildlink3.mk"
141-
.include "../../devel/hs-refact/buildlink3.mk"
142-
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
143-
.include "../../sysutils/hs-temporary/buildlink3.mk"
144-
.include "../../devel/hs-unordered-containers/buildlink3.mk"
130+
#.include "../../converters/hs-aeson/buildlink3.mk"
131+
#.include "../../devel/hs-ghcide/buildlink3.mk"
132+
#.include "../../devel/hs-hashable/buildlink3.mk"
133+
#.include "../../devel/hlint/buildlink3.mk"
134+
#.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
135+
#.include "../../devel/hs-lens/buildlink3.mk"
136+
#.include "../../devel/hs-lsp/buildlink3.mk"
137+
#.include "../../devel/hs-refact/buildlink3.mk"
138+
#.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
139+
#.include "../../sysutils/hs-temporary/buildlink3.mk"
140+
#.include "../../devel/hs-unordered-containers/buildlink3.mk"
141+
#.include "../../devel/hs-ghc-lib-parser-ex/buildlink3.mk"
142+
#.include "../../devel/hs-apply-refact/buildlink3.mk"
143+
#.include "../../devel/hs-ghc-lib-parser/buildlink3.mk"
145144

146145
# lib:hls-stan-plugin
147-
.include "../../devel/hs-ghcide/buildlink3.mk"
148146
.include "../../devel/hs-hashable/buildlink3.mk"
149147
.include "../../devel/hs-hie-compat/buildlink3.mk"
150148
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
149+
.include "../../devel/hs-ghcide/buildlink3.mk"
151150
.include "../../devel/hs-lsp-types/buildlink3.mk"
151+
.include "../../devel/hs-unordered-containers/buildlink3.mk"
152152
.include "../../devel/stan/buildlink3.mk"
153153
.include "../../devel/hs-trial/buildlink3.mk"
154-
.include "../../devel/hs-unordered-containers/buildlink3.mk"
155154

156155
# lib:hls-module-name-plugin
157156
.include "../../converters/hs-aeson/buildlink3.mk"
@@ -190,11 +189,11 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
190189
.include "../../devel/hs-syb/buildlink3.mk"
191190

192191
# lib:hls-qualify-imported-names-plugin
193-
.include "../../devel/hs-dlist/buildlink3.mk"
194192
.include "../../devel/hs-ghcide/buildlink3.mk"
195193
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
196194
.include "../../devel/hs-lens/buildlink3.mk"
197195
.include "../../devel/hs-lsp/buildlink3.mk"
196+
.include "../../devel/hs-dlist/buildlink3.mk"
198197

199198
# lib:hls-code-range-plugin
200199
.include "../../misc/hs-extra/buildlink3.mk"
@@ -216,8 +215,8 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
216215
# lib:hls-gadt-plugin
217216
.include "../../converters/hs-aeson/buildlink3.mk"
218217
.include "../../misc/hs-extra/buildlink3.mk"
219-
.include "../../devel/hs-ghc-exactprint/buildlink3.mk"
220218
.include "../../devel/hs-ghcide/buildlink3.mk"
219+
.include "../../devel/hs-ghc-exactprint/buildlink3.mk"
221220
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
222221
.include "../../devel/hs-lens/buildlink3.mk"
223222
.include "../../devel/hs-lsp/buildlink3.mk"
@@ -230,21 +229,21 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
230229
.include "../../devel/hs-lsp/buildlink3.mk"
231230

232231
# lib:hls-explicit-record-fields-plugin
233-
.include "../../converters/hs-aeson/buildlink3.mk"
234232
.include "../../devel/hs-ghcide/buildlink3.mk"
235-
.include "../../devel/hs-hls-graph/buildlink3.mk"
236233
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
237-
.include "../../devel/hs-lens/buildlink3.mk"
238234
.include "../../devel/hs-lsp/buildlink3.mk"
235+
.include "../../devel/hs-lens/buildlink3.mk"
236+
.include "../../devel/hs-hls-graph/buildlink3.mk"
239237
.include "../../devel/hs-syb/buildlink3.mk"
238+
.include "../../converters/hs-aeson/buildlink3.mk"
240239

241240
# lib:hls-overloaded-record-dot-plugin
242241
.include "../../converters/hs-aeson/buildlink3.mk"
243242
.include "../../devel/hs-ghcide/buildlink3.mk"
244-
.include "../../devel/hs-hls-graph/buildlink3.mk"
245243
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
246-
.include "../../devel/hs-lens/buildlink3.mk"
247244
.include "../../devel/hs-lsp/buildlink3.mk"
245+
.include "../../devel/hs-lens/buildlink3.mk"
246+
.include "../../devel/hs-hls-graph/buildlink3.mk"
248247
.include "../../devel/hs-syb/buildlink3.mk"
249248

250249
# lib:hls-floskell-plugin
@@ -253,57 +252,84 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
253252
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
254253
.include "../../devel/hs-lsp-types/buildlink3.mk"
255254

255+
CONFIGURE_ARGS+= -f -fourmolu # Broken at the moment.
256256
# lib:hls-fourmolu-plugin
257-
.include "../../devel/fourmolu/buildlink3.mk"
258-
.include "../../devel/hs-ghcide/buildlink3.mk"
259-
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
260-
.include "../../devel/hs-lens/buildlink3.mk"
261-
.include "../../devel/hs-lsp/buildlink3.mk"
262-
.include "../../sysutils/hs-process-extras/buildlink3.mk"
257+
#.include "../../devel/fourmolu/buildlink3.mk"
258+
#.include "../../devel/hs-ghcide/buildlink3.mk"
259+
#.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
260+
#.include "../../devel/hs-lens/buildlink3.mk"
261+
#.include "../../devel/hs-lsp/buildlink3.mk"
262+
#.include "../../sysutils/hs-process-extras/buildlink3.mk"
263+
#.include "../../textproc/hs-yaml/buildlink3.mk"
263264

264265
# lib:hls-ormolu-plugin
265266
.include "../../misc/hs-extra/buildlink3.mk"
266267
.include "../../devel/hs-ghcide/buildlink3.mk"
267268
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
268269
.include "../../devel/hs-lsp/buildlink3.mk"
269-
.include "../../devel/ormolu/buildlink3.mk"
270270
.include "../../sysutils/hs-process-extras/buildlink3.mk"
271+
.include "../../devel/ormolu/buildlink3.mk"
271272

273+
CONFIGURE_ARGS+= -f -stylishHaskell # Broken at the moment.
272274
# lib:hls-stylish-haskell-plugin
273-
.include "../../devel/hs-ghcide/buildlink3.mk"
274-
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
275-
.include "../../devel/hs-lsp-types/buildlink3.mk"
276-
.include "../../devel/stylish-haskell/buildlink3.mk"
275+
#.include "../../devel/hs-ghcide/buildlink3.mk"
276+
#.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
277+
#.include "../../devel/hs-lsp-types/buildlink3.mk"
278+
#.include "../../devel/stylish-haskell/buildlink3.mk"
277279

278280
# lib:hls-refactor-plugin
279-
.include "../../devel/hs-data-default/buildlink3.mk"
281+
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
282+
.include "../../devel/hs-ghcide/buildlink3.mk"
283+
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
284+
.include "../../devel/hs-lsp/buildlink3.mk"
285+
.include "../../devel/hs-unordered-containers/buildlink3.mk"
286+
.include "../../devel/hs-ghc-exactprint/buildlink3.mk"
287+
.include "../../misc/hs-extra/buildlink3.mk"
288+
.include "../../devel/hs-syb/buildlink3.mk"
289+
.include "../../devel/hs-hls-graph/buildlink3.mk"
280290
.include "../../devel/hs-dlist/buildlink3.mk"
291+
.include "../../devel/hs-lens/buildlink3.mk"
292+
.include "../../textproc/hs-regex-applicative/buildlink3.mk"
293+
.include "../../devel/hs-parser-combinators/buildlink3.mk"
294+
295+
# lib:hls-semantic-tokens-plugin
281296
.include "../../misc/hs-extra/buildlink3.mk"
282-
.include "../../devel/hs-ghc-exactprint/buildlink3.mk"
297+
.include "../../textproc/hs-text-rope/buildlink3.mk"
283298
.include "../../devel/hs-ghcide/buildlink3.mk"
284-
.include "../../devel/hs-hls-graph/buildlink3.mk"
285299
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
286300
.include "../../devel/hs-lens/buildlink3.mk"
287301
.include "../../devel/hs-lsp/buildlink3.mk"
288-
.include "../../devel/hs-parser-combinators/buildlink3.mk"
289-
.include "../../textproc/hs-regex-applicative/buildlink3.mk"
290-
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
291-
.include "../../devel/retrie/buildlink3.mk"
292302
.include "../../devel/hs-syb/buildlink3.mk"
293-
.include "../../devel/hs-unordered-containers/buildlink3.mk"
294-
295-
# lib:hls-semantic-tokens-plugin
296-
.include "../../devel/hs-data-default/buildlink3.mk"
297303
.include "../../devel/hs-dlist/buildlink3.mk"
298-
.include "../../misc/hs-extra/buildlink3.mk"
304+
.include "../../devel/hs-hls-graph/buildlink3.mk"
305+
.include "../../devel/hs-data-default/buildlink3.mk"
306+
.include "../../devel/hs-stm-containers/buildlink3.mk"
307+
308+
# lib:hls-notes-plugin
299309
.include "../../devel/hs-ghcide/buildlink3.mk"
300310
.include "../../devel/hs-hls-graph/buildlink3.mk"
301311
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
302312
.include "../../devel/hs-lens/buildlink3.mk"
303313
.include "../../devel/hs-lsp/buildlink3.mk"
304-
.include "../../devel/hs-stm-containers/buildlink3.mk"
305-
.include "../../devel/hs-syb/buildlink3.mk"
314+
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
306315
.include "../../textproc/hs-text-rope/buildlink3.mk"
316+
.include "../../devel/hs-unordered-containers/buildlink3.mk"
317+
318+
# lib:ghcide-bench-lib
319+
.include "../../converters/hs-aeson/buildlink3.mk"
320+
.include "../../devel/hs-async/buildlink3.mk"
321+
.include "../../misc/hs-extra/buildlink3.mk"
322+
.include "../../devel/hs-ghcide/buildlink3.mk"
323+
.include "../../devel/hs-hashable/buildlink3.mk"
324+
.include "../../devel/hs-lens/buildlink3.mk"
325+
.include "../../devel/hs-lsp-test/buildlink3.mk"
326+
.include "../../devel/hs-lsp-types/buildlink3.mk"
327+
.include "../../devel/hs-optparse-applicative/buildlink3.mk"
328+
.include "../../devel/hs-parser-combinators/buildlink3.mk"
329+
.include "../../devel/hs-safe-exceptions/buildlink3.mk"
330+
.include "../../devel/hs-shake/buildlink3.mk"
331+
.include "../../devel/hs-hls-test-utils/buildlink3.mk"
332+
.include "../../devel/hs-row-types/buildlink3.mk"
307333

308334
# exe:haskell-language-server
309335
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
@@ -320,5 +346,22 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= haskell-language-server-wrapper
320346
.include "../../devel/hs-lsp-types/buildlink3.mk"
321347
.include "../../devel/hs-unliftio-core/buildlink3.mk"
322348

349+
# exe:ghcide-bench
350+
.include "../../converters/hs-aeson/buildlink3.mk"
351+
.include "../../devel/hs-data-default/buildlink3.mk"
352+
.include "../../misc/hs-extra/buildlink3.mk"
353+
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
354+
.include "../../devel/hs-hls-test-utils/buildlink3.mk"
355+
.include "../../devel/hs-lens/buildlink3.mk"
356+
.include "../../devel/hs-lsp-test/buildlink3.mk"
357+
.include "../../devel/hs-lsp-types/buildlink3.mk"
358+
OPTPARSE_APPLICATIVE_EXECUTABLES+= \
359+
ghcide-bench
360+
.include "../../devel/hs-optparse-applicative/application.mk"
361+
.include "../../devel/hs-safe-exceptions/buildlink3.mk"
362+
.include "../../devel/hs-hls-graph/buildlink3.mk"
363+
.include "../../devel/hs-shake/buildlink3.mk"
364+
.include "../../devel/hs-tasty-hunit/buildlink3.mk"
365+
323366
.include "../../mk/haskell.mk"
324367
.include "../../mk/bsd.pkg.mk"

0 commit comments

Comments
 (0)