Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the AGPL flag manual in cabal #250

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Make the AGPL flag manual in cabal #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
610b82e
Make the AGPL flag manual in cabal
fendor Jul 29, 2020
1f26704
Disable Brittany for GHC Versions >= 8.10.1
fendor Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
, Ormolu.descriptor "ormolu"
, StylishHaskell.descriptor "stylish-haskell"
#if AGPL
#if !MIN_VERSION_ghc(8,10,1)
, Brittany.descriptor "brittany"
#endif
#endif
, Eval.descriptor "eval"
]
Expand Down
11 changes: 6 additions & 5 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extra-source-files:
flag agpl
Description: Enable AGPL dependencies
Default: True
Manual: False
Manual: True

flag pedantic
Description: Enable -Werror
Expand Down Expand Up @@ -95,10 +95,11 @@ library
else
build-depends: unix
if flag(agpl)
build-depends:
brittany
exposed-modules:
Ide.Plugin.Brittany
if impl(ghc < 8.10)
build-depends:
brittany
exposed-modules:
Ide.Plugin.Brittany

ghc-options:
-Wall
Expand Down