Skip to content

Commit 53d2e50

Browse files
committed
Drop AGPL flag
1 parent 9742652 commit 53d2e50

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ For example, `haskell-language-server` allows you to choose the formatting provi
301301
This option obviously would not make sense for language servers for other languages, or even for other Haskell language servers (which need not even support formatting).
302302

303303
Here is a list of the additional settings currently supported by `haskell-language-server`, along with their setting key (you may not need to know this) and default:
304-
- Formatting provider (`haskell.formattingProvider`, default `ormolu`): what formatter to use; one of `floskell`, `ormolu`, `fourmolu`, `stylish-haskell`, or `brittany` (if compiled with AGPL)
304+
- Formatting provider (`haskell.formattingProvider`, default `ormolu`): what formatter to use; one of `floskell`, `ormolu`, `fourmolu`, `stylish-haskell`, or `brittany` (if compiled with the brittany plugin)
305305
- Format on imports (`haskell.formatOnImportOn`, default true): whether to format after adding an import
306306
- Maximum number of problems to report (`haskell.maxNumberOfProblems`, default 100): the maximum number of problems the server will send to the client
307307
- Diagnostics on change (`haskell.diagnosticsOnChange`, default true): (currently unused)
@@ -648,7 +648,7 @@ This issue should be fixed in Stack versions >= 2.5.
648648
#### Problems with dynamic linking
649649

650650
As haskell-language-server prebuilt binaries are statically linked, they don't play well with projects using dynamic linking.
651-
An usual symptom is the presence of errors containing `unknown symbol` and it is typical in arch linux, where a dynamically linked version of ghc is used.
651+
An usual symptom is the presence of errors containing `unknown symbol` and it is typical in arch linux, where a dynamically linked version of ghc is used.
652652

653653
The workaround is to use a version of haskell-language-server compiled from source with `-dynamic` enabled`. See more details [here](https://github.com/haskell/haskell-language-server/issues/1160#issuecomment-756566273).
654654

docs/plugin-tutorial.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ idePlugins = pluginDescToIdePlugins allPlugins
9696
, Ormolu.descriptor "ormolu"
9797
, StylishHaskell.descriptor "stylish-haskell"
9898
, Retrie.descriptor "retrie"
99-
#if AGPL
10099
, Brittany.descriptor "brittany"
101-
#endif
102100
, Eval.descriptor "eval"
103101
]
104102
```

exe/Plugins.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import Ide.Plugin.Ormolu as Ormolu
7171
import Ide.Plugin.StylishHaskell as StylishHaskell
7272
#endif
7373

74-
#if AGPL && brittany
74+
#if brittany
7575
import Ide.Plugin.Brittany as Brittany
7676
#endif
7777

haskell-language-server.cabal

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ extra-source-files:
2020
ChangeLog.md
2121
include/ghc-api-version.h
2222

23-
flag agpl
24-
description: Enable AGPL dependencies
25-
default: True
26-
manual: True
27-
2823
flag pedantic
2924
description: Enable -Werror
3025
default: False
@@ -34,10 +29,6 @@ source-repository head
3429
type: git
3530
location: https://github.com/haskell/haskell-language-server
3631

37-
common agpl
38-
if flag(agpl)
39-
cpp-options: -DAGPL
40-
4132
common common-deps
4233
build-depends:
4334
, base >=4.12 && <5
@@ -47,7 +38,7 @@ common common-deps
4738
, text
4839

4940
library
50-
import: agpl, common-deps
41+
import: common-deps
5142
exposed-modules:
5243
Ide.Arguments
5344
Ide.Main
@@ -269,12 +260,11 @@ common stylishHaskell
269260
cpp-options: -DstylishHaskell
270261

271262
common brittany
272-
if (flag(brittany) || flag(all-formatters)) && flag(agpl)
263+
if (flag(brittany) || flag(all-formatters))
273264
build-depends: hls-brittany-plugin ^>= 1.0.0.0
274265

275266
executable haskell-language-server
276-
import: agpl
277-
, common-deps
267+
import: common-deps
278268
-- plugins
279269
, example-plugins
280270
, class
@@ -346,7 +336,7 @@ executable haskell-language-server
346336
default-extensions: DataKinds, TypeOperators
347337

348338
executable haskell-language-server-wrapper
349-
import: agpl, common-deps
339+
import: common-deps
350340
main-is: Wrapper.hs
351341
hs-source-dirs: exe
352342
other-modules: Paths_haskell_language_server
@@ -379,7 +369,7 @@ executable haskell-language-server-wrapper
379369
-- We removed it due to issues with stack when loading the project using a stack based hie.yaml
380370
-- See https://github.com/haskell/haskell-language-server/issues/114
381371
common hls-test-utils
382-
import: agpl, common-deps
372+
import: common-deps
383373
hs-source-dirs: test/utils
384374
other-modules: Test.Hls.Util
385375
build-depends:
@@ -411,7 +401,7 @@ common hls-test-utils
411401
default-language: Haskell2010
412402

413403
test-suite func-test
414-
import: agpl, common-deps, hls-test-utils
404+
import: common-deps, hls-test-utils
415405
type: exitcode-stdio-1.0
416406
default-language: Haskell2010
417407
build-tool-depends:
@@ -471,7 +461,7 @@ test-suite func-test
471461
ghc-options: -Werror -Wredundant-constraints
472462

473463
test-suite wrapper-test
474-
import: agpl, hls-test-utils
464+
import: hls-test-utils
475465
type: exitcode-stdio-1.0
476466
build-tool-depends:
477467
haskell-language-server:haskell-language-server-wrapper -any

0 commit comments

Comments
 (0)