Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit ffcb0fc

Browse files
authored
Merge pull request #1253 from alanz/haskell-lsp-from-hackage
Use haskell-lsp-12.1.0 from hackage
2 parents 4d9e19a + 5f5729b commit ffcb0fc

15 files changed

+23
-51
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@
3131
# url = https://github.com/bubba/ghc-mod.git
3232
url = https://github.com/alanz/ghc-mod.git
3333

34-
[submodule "submodules/haskell-lsp"]
35-
path = submodules/haskell-lsp
36-
url = https://github.com/alanz/haskell-lsp.git

cabal.project

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ packages:
88
./submodules/ghc-mod/
99
./submodules/ghc-mod/core/
1010
./submodules/ghc-mod/ghc-project-types
11-
./submodules/haskell-lsp
12-
./submodules/haskell-lsp/haskell-lsp-types
1311

1412
tests: true

stack-8.2.1.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
# - brittany-0.11.0.0
1715
- butcher-1.3.1.1
@@ -22,8 +20,8 @@ extra-deps:
2220
- ghc-exactprint-0.5.8.2
2321
- haddock-api-2.18.1
2422
- haddock-library-1.4.4
25-
# - haskell-lsp-0.12.1.0
26-
# - haskell-lsp-types-0.12.1.0
23+
- haskell-lsp-0.12.1.0
24+
- haskell-lsp-types-0.12.1.0
2725
- hlint-2.0.11
2826
- hsimport-0.8.8
2927
- lsp-test-0.5.2.2

stack-8.2.2.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
# - brittany-0.11.0.0
1715
- butcher-1.3.1.1
@@ -23,8 +21,8 @@ extra-deps:
2321
- ghc-exactprint-0.5.8.2
2422
- haddock-api-2.18.1
2523
- haddock-library-1.4.4
26-
# - haskell-lsp-0.12.1.0
27-
# - haskell-lsp-types-0.12.1.0
24+
- haskell-lsp-0.12.1.0
25+
- haskell-lsp-types-0.12.1.0
2826
- haskell-src-exts-1.21.0
2927
- haskell-src-exts-util-0.2.5
3028
- hlint-2.1.17

stack-8.4.2.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
# - brittany-0.11.0.0
1715
- base-compat-0.9.3
@@ -21,8 +19,8 @@ extra-deps:
2119
- ghc-exactprint-0.5.8.2
2220
- haddock-api-2.20.0
2321
- haddock-library-1.6.0
24-
# - haskell-lsp-0.12.1.0
25-
# - haskell-lsp-types-0.12.1.0
22+
- haskell-lsp-0.12.1.0
23+
- haskell-lsp-types-0.12.1.0
2624
- haskell-src-exts-1.21.0
2725
- haskell-src-exts-util-0.2.5
2826
- hlint-2.1.17

stack-8.4.3.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
- base-compat-0.9.3
1715
- cabal-plan-0.3.0.0
@@ -20,8 +18,8 @@ extra-deps:
2018
- ghc-exactprint-0.5.8.2
2119
- haddock-api-2.20.0
2220
- haddock-library-1.6.0
23-
# - haskell-lsp-0.12.1.0
24-
# - haskell-lsp-types-0.12.1.0
21+
- haskell-lsp-0.12.1.0
22+
- haskell-lsp-types-0.12.1.0
2523
- haskell-src-exts-1.21.0
2624
- haskell-src-exts-util-0.2.5
2725
- hlint-2.1.17

stack-8.4.4.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
# - brittany-0.11.0.0
1715
- cabal-plan-0.4.0.0
@@ -20,8 +18,8 @@ extra-deps:
2018
- ghc-exactprint-0.5.8.2
2119
- haddock-api-2.20.0
2220
- haddock-library-1.6.0
23-
# - haskell-lsp-0.12.1.0
24-
# - haskell-lsp-types-0.12.1.0
21+
- haskell-lsp-0.12.1.0
22+
- haskell-lsp-types-0.12.1.0
2523
- haskell-src-exts-1.21.0
2624
- haskell-src-exts-util-0.2.5
2725
- hlint-2.1.17

stack-8.6.1.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
- apply-refact-0.6.0.0
1715
- butcher-1.3.2.1
@@ -22,8 +20,8 @@ extra-deps:
2220
- data-tree-print-0.1.0.2
2321
- floskell-0.10.0
2422
- haddock-api-2.21.0
25-
# - haskell-lsp-0.12.1.0
26-
# - haskell-lsp-types-0.12.1.0
23+
- haskell-lsp-0.12.1.0
24+
- haskell-lsp-types-0.12.1.0
2725
- haskell-src-exts-1.21.0
2826
- haskell-src-exts-util-0.2.5
2927
- hlint-2.1.17

stack-8.6.2.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
- butcher-1.3.2.1
1715
- cabal-plan-0.4.0.0
1816
- constrained-dynamic-0.1.0.0
1917
- floskell-0.10.0
2018
- haddock-api-2.21.0
21-
# - haskell-lsp-0.12.1.0
22-
# - haskell-lsp-types-0.12.1.0
19+
- haskell-lsp-0.12.1.0
20+
- haskell-lsp-types-0.12.1.0
2321
- haskell-src-exts-1.21.0
2422
- haskell-src-exts-util-0.2.5
2523
- hlint-2.1.17

stack-8.6.3.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212
- ./submodules/ghc-mod/ghc-project-types
13-
- ./submodules/haskell-lsp
14-
- ./submodules/haskell-lsp/haskell-lsp-types
1513

1614
- butcher-1.3.2.1
1715
- cabal-plan-0.4.0.0
1816
- constrained-dynamic-0.1.0.0
1917
- floskell-0.10.0
2018
- haddock-api-2.21.0
21-
# - haskell-lsp-0.12.1.0
22-
# - haskell-lsp-types-0.12.1.0
19+
- haskell-lsp-0.12.1.0
20+
- haskell-lsp-types-0.12.1.0
2321
- haskell-src-exts-1.21.0
2422
- haskell-src-exts-util-0.2.5
2523
- hlint-2.1.17

0 commit comments

Comments
 (0)