Skip to content

Commit

Permalink
dev-haskell/haskell-language-server: add 2.4.0.0, drop 2.0.0.1
Browse files Browse the repository at this point in the history 
Signed-off-by: hololeap <[email protected]>
  • Loading branch information
@hololeap
hololeap committed Oct 15, 2023
1 parent 926a206 commit c372a84
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 93 deletions.
2 changes: 1 addition & 1 deletion dev-haskell/haskell-language-server/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST haskell-language-server-2.0.0.1.tar.gz 90696 BLAKE2B 7264d4f9f5fd37237d6686b2d2dae75a777a4f36208248498d970aa48b6d40b13bd2b22799347d2d486e9c60af1128e5e9a5937f852b114e0eebfa777c2a281e SHA512 03f6651d28a1474d3a52a80991592e201e6b611db306b34d437b4e3cbc6d1050a694f1f135d03efd0613769c0d8ffae2abfc8e6291fbdff46cf148ad9b515b46
DIST haskell-language-server-2.4.0.0.tar.gz 77669 BLAKE2B afe80bed3fd2634fbf8e1e09145f252fc968cbd1a7cc16a8c08e7bc6f73064578af4d7797acd2069db668e0374894f33ae7e31016cfe50405be9e39b750b6807 SHA512 a6982d19c06d3f7c89a31de0f97284b5f9dac63c58ba12c0020ca67f981257041982cc0fb22a957d5e0caa7f3e92da7c18e58adb73fde4bd62c547dfa523f33b
156 changes: 74 additions & 82 deletions ...er/haskell-language-server-2.0.0.1.ebuild → ...er/haskell-language-server-2.4.0.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,22 @@

EAPI=8

#hackport: flags: cabalfmt:hls_formatters_cabal-fmt,floskell:hls_formatters_floskell,fourmolu:hls_formatters_fourmolu,ormolu:hls_formatters_ormolu,refactor:hls_formatters_refactor,stylishhaskell:hls_formatters_stylish-haskell,alternateNumberFormat:hls_plugins_alternate-number-format,cabal:hls_plugins_cabal,callHierarchy:hls_plugins_call-hierarchy,changeTypeSignature:hls_plugins_change-type-signature,class:hls_plugins_class,codeRange:hls_plugins_code-range,eval:hls_plugins_eval,explicitFields:hls_plugins_explicit-fields,explicitFixity:hls_plugins_explicit-fixity,gadt:hls_plugins_gadt,haddockComments:hls_plugins_haddock-comments,hlint:hls_plugins_hlint,importLens:hls_plugins_import-lens,moduleName:hls_plugins_module-name,overloadedRecordDot:hls_plugins_overloaded-record-dot,pragmas:hls_plugins_pragmas,qualifyImportedNames:hls_plugins_qualify-imported-names,refineImports:hls_plugins_refine-imports,rename:hls_plugins_rename,retrie:hls_plugins_retrie,splice:hls_plugins_splice,stan:hls_plugins_stan,tactic:hls_plugins_wingman,-dynamic,+ignore-plugins-ghc-bounds,-pedantic
#hackport: flags: cabalfmt:hls_formatters_cabal-fmt,floskell:hls_formatters_floskell,fourmolu:hls_formatters_fourmolu,ormolu:hls_formatters_ormolu,refactor:hls_formatters_refactor,stylishhaskell:hls_formatters_stylish-haskell,alternateNumberFormat:hls_plugins_alternate-number-format,cabal:hls_plugins_cabal,callHierarchy:hls_plugins_call-hierarchy,changeTypeSignature:hls_plugins_change-type-signature,class:hls_plugins_class,codeRange:hls_plugins_code-range,eval:hls_plugins_eval,explicitFields:hls_plugins_explicit-fields,explicitFixity:hls_plugins_explicit-fixity,gadt:hls_plugins_gadt,hlint:hls_plugins_hlint,importLens:hls_plugins_import-lens,moduleName:hls_plugins_module-name,overloadedRecordDot:hls_plugins_overloaded-record-dot,pragmas:hls_plugins_pragmas,qualifyImportedNames:hls_plugins_qualify-imported-names,rename:hls_plugins_rename,retrie:hls_plugins_retrie,splice:hls_plugins_splice,-dynamic,+ignore-plugins-ghc-bounds,-pedantic

CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
inherit haskell-cabal

RESTRICT="test" # Depends on masked ghcide-test-utils

DESCRIPTION="LSP server for GHC"
HOMEPAGE="https://github.com/haskell/haskell-language-server#readme"

LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64"

# TODO: Failing tests
RESTRICT="test" # 2 of 91 tests fail

# Disabled:
# - hls_plugins_class: Requires ghc-exactprint < 1.1
# - hls_plugins_haddock-comments: Requires ghc < 9.2.1
# - hls_plugins_stan: Requires ghc < 9
# - hls_plugins_wingman: Requires ghc < 9.2.1
IUSE_HLS_PLUGINS="
+hls_plugins_alternate-number-format
+hls_plugins_cabal
Expand All @@ -39,7 +35,6 @@ IUSE_HLS_PLUGINS="
+hls_plugins_overloaded-record-dot
+hls_plugins_pragmas
+hls_plugins_qualify-imported-names
+hls_plugins_refine-imports
+hls_plugins_rename
+hls_plugins_retrie
+hls_plugins_splice
Expand All @@ -65,12 +60,9 @@ CABAL_TEST_REQUIRED_BINS=(
)

# Disabled:
# hls_formatters_fourmolu? ( ~dev-haskell/hls-fourmolu-plugin-2.0.0.1:=[profile?] )
# hls_formatters_ormolu? ( ~dev-haskell/hls-ormolu-plugin-2.0.0.1:=[profile?] )
# hls_plugins_class? ( ~dev-haskell/hls-class-plugin-2.0.0.1:=[profile?] )
# hls_plugins_haddock-comments? ( ~dev-haskell/hls-haddock-comments-plugin-2.0.0.1:=[profile?] )
# hls_plugins_stan? ( >=dev-haskell/hls-stan-plugin-1.0:=[profile?] <dev-haskell/hls-stan-plugin-1.1:=[profile?] )
# hls_plugins_wingman? ( ~dev-haskell/hls-tactics-plugin-2.0.0.1:=[profile?] )
# hls_formatters_fourmolu? ( ~dev-haskell/hls-fourmolu-plugin-2.4.0.0:=[profile?] )
# hls_formatters_ormolu? ( ~dev-haskell/hls-ormolu-plugin-2.4.0.0:=[profile?] )
# hls_plugins_class? ( ~dev-haskell/hls-class-plugin-2.4.0.0:=[profile?] )
RDEPEND="
dev-haskell/aeson:=[profile?]
dev-haskell/aeson-pretty:=[profile?]
Expand All @@ -80,19 +72,20 @@ RDEPEND="
dev-haskell/data-default:=[profile?]
dev-haskell/extra:=[profile?]
dev-haskell/ghc-paths:=[profile?]
~dev-haskell/ghcide-2.0.0.1:=[profile?]
~dev-haskell/ghcide-2.4.0.0:=[profile?]
dev-haskell/gitrev:=[profile?]
dev-haskell/githash:=[profile?]
dev-haskell/hashable:=[profile?]
dev-haskell/hie-bios:=[profile?]
dev-haskell/hiedb:=[profile?]
>dev-haskell/hls-graph-1.7.0.0:=[profile?]
~dev-haskell/hls-plugin-api-2.0.0.1:=[profile?]
~dev-haskell/hls-plugin-api-2.4.0.0:=[profile?]
dev-haskell/lens:=[profile?]
dev-haskell/lsp:=[profile?]
>=dev-haskell/lsp-2.2.0.0:=[profile?]
dev-haskell/lsp-types:=[profile?]
dev-haskell/optparse-applicative:=[profile?]
dev-haskell/optparse-simple:=[profile?]
>=dev-haskell/prettyprinter-1.7:=[profile?]
dev-haskell/regex-tdfa:=[profile?]
dev-haskell/safe-exceptions:=[profile?]
dev-haskell/sqlite-simple:=[profile?]
Expand All @@ -101,75 +94,74 @@ RDEPEND="
dev-haskell/unliftio-core:=[profile?]
dev-haskell/unordered-containers:=[profile?]
>=dev-lang/ghc-8.6.3:=
hls_formatters_cabal-fmt? ( ~dev-haskell/hls-cabal-fmt-plugin-2.0.0.1:=[profile?] )
hls_formatters_floskell? ( ~dev-haskell/hls-floskell-plugin-2.0.0.1:=[profile?] )
hls_formatters_refactor? ( ~dev-haskell/hls-refactor-plugin-2.0.0.1:=[profile?] )
hls_formatters_stylish-haskell? ( ~dev-haskell/hls-stylish-haskell-plugin-2.0.0.1:=[profile?] )
hls_plugins_alternate-number-format? ( ~dev-haskell/hls-alternate-number-format-plugin-2.0.0.1:=[profile?] )
hls_plugins_cabal? ( ~dev-haskell/hls-cabal-plugin-2.0.0.1:=[profile?] )
hls_plugins_call-hierarchy? ( ~dev-haskell/hls-call-hierarchy-plugin-2.0.0.1:=[profile?] )
hls_plugins_change-type-signature? ( ~dev-haskell/hls-change-type-signature-plugin-2.0.0.1:=[profile?] )
hls_plugins_code-range? ( ~dev-haskell/hls-code-range-plugin-2.0.0.1:=[profile?] )
hls_plugins_eval? ( ~dev-haskell/hls-eval-plugin-2.0.0.1:=[profile?] )
hls_plugins_explicit-fields? ( ~dev-haskell/hls-explicit-record-fields-plugin-2.0.0.1:=[profile?] )
hls_plugins_explicit-fixity? ( ~dev-haskell/hls-explicit-fixity-plugin-2.0.0.1:=[profile?] )
hls_plugins_gadt? ( ~dev-haskell/hls-gadt-plugin-2.0.0.1:=[profile?] )
hls_plugins_hlint? ( ~dev-haskell/hls-hlint-plugin-2.0.0.1:=[profile?] )
hls_plugins_import-lens? ( ~dev-haskell/hls-explicit-imports-plugin-2.0.0.1:=[profile?] )
hls_plugins_module-name? ( ~dev-haskell/hls-module-name-plugin-2.0.0.1:=[profile?] )
hls_plugins_overloaded-record-dot? ( ~dev-haskell/hls-overloaded-record-dot-plugin-2.0.0.1:=[profile?] )
hls_plugins_pragmas? ( ~dev-haskell/hls-pragmas-plugin-2.0.0.1:=[profile?] )
hls_plugins_qualify-imported-names? ( ~dev-haskell/hls-qualify-imported-names-plugin-2.0.0.1:=[profile?] )
hls_plugins_refine-imports? ( ~dev-haskell/hls-refine-imports-plugin-2.0.0.1:=[profile?] )
hls_plugins_rename? ( ~dev-haskell/hls-rename-plugin-2.0.0.1:=[profile?] )
hls_plugins_retrie? ( ~dev-haskell/hls-retrie-plugin-2.0.0.1:=[profile?] )
hls_plugins_splice? ( ~dev-haskell/hls-splice-plugin-2.0.0.1:=[profile?] )
hls_formatters_cabal-fmt? ( ~dev-haskell/hls-cabal-fmt-plugin-2.4.0.0:=[profile?] )
hls_formatters_floskell? ( ~dev-haskell/hls-floskell-plugin-2.4.0.0:=[profile?] )
hls_formatters_refactor? ( ~dev-haskell/hls-refactor-plugin-2.4.0.0:=[profile?] )
hls_formatters_stylish-haskell? ( ~dev-haskell/hls-stylish-haskell-plugin-2.4.0.0:=[profile?] )
hls_plugins_alternate-number-format? ( ~dev-haskell/hls-alternate-number-format-plugin-2.4.0.0:=[profile?] )
hls_plugins_cabal? ( ~dev-haskell/hls-cabal-plugin-2.4.0.0:=[profile?] )
hls_plugins_call-hierarchy? ( ~dev-haskell/hls-call-hierarchy-plugin-2.4.0.0:=[profile?] )
hls_plugins_change-type-signature? ( ~dev-haskell/hls-change-type-signature-plugin-2.4.0.0:=[profile?] )
hls_plugins_code-range? ( ~dev-haskell/hls-code-range-plugin-2.4.0.0:=[profile?] )
hls_plugins_eval? ( ~dev-haskell/hls-eval-plugin-2.4.0.0:=[profile?] )
hls_plugins_explicit-fields? ( ~dev-haskell/hls-explicit-record-fields-plugin-2.4.0.0:=[profile?] )
hls_plugins_explicit-fixity? ( ~dev-haskell/hls-explicit-fixity-plugin-2.4.0.0:=[profile?] )
hls_plugins_gadt? ( ~dev-haskell/hls-gadt-plugin-2.4.0.0:=[profile?] )
hls_plugins_hlint? ( ~dev-haskell/hls-hlint-plugin-2.4.0.0:=[profile?] )
hls_plugins_import-lens? ( ~dev-haskell/hls-explicit-imports-plugin-2.4.0.0:=[profile?] )
hls_plugins_module-name? ( ~dev-haskell/hls-module-name-plugin-2.4.0.0:=[profile?] )
hls_plugins_overloaded-record-dot? ( ~dev-haskell/hls-overloaded-record-dot-plugin-2.4.0.0:=[profile?] )
hls_plugins_pragmas? ( ~dev-haskell/hls-pragmas-plugin-2.4.0.0:=[profile?] )
hls_plugins_qualify-imported-names? ( ~dev-haskell/hls-qualify-imported-names-plugin-2.4.0.0:=[profile?] )
hls_plugins_rename? ( ~dev-haskell/hls-rename-plugin-2.4.0.0:=[profile?] )
hls_plugins_retrie? ( ~dev-haskell/hls-retrie-plugin-2.4.0.0:=[profile?] )
hls_plugins_splice? ( ~dev-haskell/hls-splice-plugin-2.4.0.0:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.4.0.1
test? (
dev-haskell/ghcide
dev-haskell/ghcide-test-utils
~dev-haskell/hls-test-utils-2.0.0.1
dev-haskell/hspec-expectations
dev-haskell/lens-aeson
dev-haskell/lsp-test
dev-haskell/lsp-types
)
"
# test? (
# dev-haskell/ghcide
# dev-haskell/ghcide-test-utils
# ~dev-haskell/hls-test-utils-2.4.0.0
# dev-haskell/hspec-expectations
# dev-haskell/lens-aeson
# dev-haskell/lsp-test
# dev-haskell/lsp-types
# dev-haskell/row-types
# )

src_configure() {
haskell-cabal_src_configure \
$(cabal_flag hls_formatters_cabal-fmt cabalfmt) \
$(cabal_flag hls_formatters_floskell floskell) \
$(cabal_flag hls_formatters_refactor refactor) \
$(cabal_flag hls_formatters_stylish-haskell stylishhaskell) \
$(cabal_flag hls_plugins_alternate-number-format alternateNumberFormat) \
$(cabal_flag hls_plugins_cabal cabal) \
$(cabal_flag hls_plugins_call-hierarchy callHierarchy) \
$(cabal_flag hls_plugins_change-type-signature changeTypeSignature) \
$(cabal_flag hls_plugins_code-range codeRange) \
$(cabal_flag hls_plugins_eval eval) \
$(cabal_flag hls_plugins_explicit-fields explicitFields) \
$(cabal_flag hls_plugins_explicit-fixity explicitFixity) \
$(cabal_flag hls_plugins_gadt gadt) \
$(cabal_flag hls_plugins_hlint hlint) \
$(cabal_flag hls_plugins_import-lens importLens) \
$(cabal_flag hls_plugins_module-name moduleName) \
$(cabal_flag hls_plugins_overloaded-record-dot overloadedRecordDot) \
$(cabal_flag hls_plugins_pragmas pragmas) \
$(cabal_flag hls_plugins_qualify-imported-names qualifyImportedNames) \
$(cabal_flag hls_plugins_refine-imports refineImports) \
$(cabal_flag hls_plugins_rename rename) \
$(cabal_flag hls_plugins_retrie retrie) \
$(cabal_flag hls_plugins_splice splice) \
--flag=-fourmolu \
--flag=-ormolu \
--flag=-class \
--flag=-haddockComments \
--flag=-stan \
--flag=-tactic \
--flag=-dynamic \
--flag=ignore-plugins-ghc-bounds \
config_flags=(
$(cabal_flag hls_formatters_cabal-fmt cabalfmt)
$(cabal_flag hls_formatters_floskell floskell)
$(cabal_flag hls_formatters_refactor refactor)
$(cabal_flag hls_formatters_stylish-haskell stylishhaskell)
$(cabal_flag hls_plugins_alternate-number-format alternateNumberFormat)
$(cabal_flag hls_plugins_cabal cabal)
$(cabal_flag hls_plugins_call-hierarchy callHierarchy)
$(cabal_flag hls_plugins_change-type-signature changeTypeSignature)
$(cabal_flag hls_plugins_code-range codeRange)
$(cabal_flag hls_plugins_eval eval)
$(cabal_flag hls_plugins_explicit-fields explicitFields)
$(cabal_flag hls_plugins_explicit-fixity explicitFixity)
$(cabal_flag hls_plugins_gadt gadt)
$(cabal_flag hls_plugins_hlint hlint)
$(cabal_flag hls_plugins_import-lens importLens)
$(cabal_flag hls_plugins_module-name moduleName)
$(cabal_flag hls_plugins_overloaded-record-dot overloadedRecordDot)
$(cabal_flag hls_plugins_pragmas pragmas)
$(cabal_flag hls_plugins_qualify-imported-names qualifyImportedNames)
$(cabal_flag hls_plugins_rename rename)
$(cabal_flag hls_plugins_retrie retrie)
$(cabal_flag hls_plugins_splice splice)
--flag=-class
--flag=-fourmolu
--flag=-ormolu
--flag=-dynamic
--flag=ignore-plugins-ghc-bounds
--flag=-pedantic
)

haskell-cabal_src_configure "${config_flags[@]}"
}
4 changes: 0 additions & 4 deletions dev-haskell/haskell-language-server/metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,15 @@
<flag name="hls_plugins_explicit-fields">Enable explicit-fields plugin</flag>
<flag name="hls_plugins_explicit-fixity">Enable explicit-fixity plugin</flag>
<flag name="hls_plugins_gadt">Enable GADT plugin</flag>
<!-- <flag name="hls_plugins_haddock-comments">Enable haddock comments plugin</flag> -->
<flag name="hls_plugins_hlint">Enable hlint plugin</flag>
<flag name="hls_plugins_import-lens">Enable importLens plugin</flag>
<flag name="hls_plugins_module-name">Enable moduleName plugin</flag>
<flag name="hls_plugins_overloaded-record-dot">Enable overloadedRecordDot plugin</flag>
<flag name="hls_plugins_pragmas">Enable pragmas plugin</flag>
<flag name="hls_plugins_qualify-imported-names">Enable qualifyImportedNames plugin</flag>
<flag name="hls_plugins_refine-imports">Enable refineImports plugin</flag>
<flag name="hls_plugins_rename">Enable rename plugin</flag>
<flag name="hls_plugins_retrie">Enable retrie plugin</flag>
<flag name="hls_plugins_splice">Enable splice plugin</flag>
<!-- <flag name="hls_plugins_wingman">Enable wingman plugin</flag> -->
<!-- <flag name="hls_formatters_brittany">Enable brittany formatter</flag> -->
<flag name="hls_formatters_cabal-fmt">Enable cabalfmt formatter</flag>
<flag name="hls_formatters_floskell">Enable floskell formatter</flag>
<!-- <flag name="hls_formatters_fourmolu">Enable fourmolu formatter</flag> -->
Expand Down
3 changes: 1 addition & 2 deletions profiles/desc/hls_formatters.desc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# hololeap <[email protected]> (2021-01-30)
# Formatters for dev-util/haskell-language-server
# (Updated 2023-07-16)
# (Updated 2023-10-13)

brittany - Enable brittany formatter
cabal-fmt - Enable cabalFmt formatter
floskell - Enable floskell formatter
fourmolu - Enable fourmolu formatter
Expand Down
5 changes: 1 addition & 4 deletions profiles/desc/hls_plugins.desc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hololeap <[email protected]> (2021-01-30)
# Plugins for dev-util/haskell-language-server
# (Updated 2023-07-16)
# (Updated 2023-10-13)

alternate-number-format - Enable Alternate Number Format plugin
cabal - Enable cabal plugin
Expand All @@ -12,15 +12,12 @@ eval - Enable eval plugin
explicit-fields - Enable explicit-fields plugin
explicit-fixity - Enable explicit-fixity plugin
gadt - Enable GADT plugin
haddock-comments - Enable haddock comments plugin
hlint - Enable hlint plugin
import-lens - Enable importLens plugin
module-name - Enable moduleName plugin
overloaded-record-dot - Enable overloadedRecordDot plugin
pragmas - Enable pragmas plugin
qualify-imported-names - Enable qualifyImportedNames plugin
refine-imports - Enable refineImports plugin
rename - Enable rename plugin
retrie - Enable retrie plugin
splice - Enable splice plugin
wingman - Enable wingman plugin

0 comments on commit c372a84

Please sign in to comment.