Skip to content

Commit 37f7350

Browse files
authored
Merge pull request haskell#914 from alanz/adjust-submodules
Use haskell-lsp/haskell-lsp-types from hackage
2 parents e3f3428 + a34ba25 commit 37f7350

File tree

7 files changed

+16
-27
lines changed

7 files changed

+16
-27
lines changed

cabal.project

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ packages:
66
./submodules/HaRe
77
./submodules/ghc-mod/
88
./submodules/ghc-mod/core/
9-
./submodules/haskell-lsp/
10-
./submodules/haskell-lsp/haskell-lsp-types

stack-8.2.1.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,19 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
13-
# - brittany-0.11.0.0
1411
- butcher-1.3.1.1
1512
- cabal-helper-0.8.1.0@rev:0
1613
- cabal-plan-0.3.0.0
1714
- constrained-dynamic-0.1.0.0
1815
- czipwith-1.0.1.0
19-
# - ghc-exactprint-0.5.6.1
2016
- ghc-exactprint-0.5.8.0
2117
- haddock-api-2.18.1
2218
- haddock-library-1.4.4
23-
- lsp-test-0.4.0.0
19+
- haskell-lsp-0.8.0.1
20+
- haskell-lsp-types-0.8.0.1
2421
- hlint-2.0.11
25-
# - hlint-2.1.8
2622
- hsimport-0.8.6
23+
- lsp-test-0.4.0.0
2724
- sorted-list-0.2.1.0
2825
- syz-0.2.0.0
2926
- yaml-0.8.32

stack-8.2.2.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
13-
# - brittany-0.11.0.0
1411
- butcher-1.3.1.1
1512
- cabal-helper-0.8.1.0@rev:0
1613
- cabal-plan-0.3.0.0
@@ -20,6 +17,8 @@ extra-deps:
2017
- ghc-exactprint-0.5.8.0
2118
- haddock-api-2.18.1
2219
- haddock-library-1.4.4
20+
- haskell-lsp-0.8.0.1
21+
- haskell-lsp-types-0.8.0.1
2322
- hsimport-0.8.6
2423
- lsp-test-0.4.0.0
2524
- sorted-list-0.2.1.0

stack-8.4.2.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,23 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
1311
- base-compat-0.9.3
14-
# - brittany-0.11.0.0
1512
- cabal-helper-0.8.1.0@rev:0
1613
- cabal-plan-0.3.0.0
1714
- constrained-dynamic-0.1.0.0
1815
- ghc-exactprint-0.5.8.0
1916
- haddock-api-2.20.0
2017
- haddock-library-1.6.0
18+
- haskell-lsp-0.8.0.1
19+
- haskell-lsp-types-0.8.0.1
2120
- hlint-2.1.8
2221
- hsimport-0.8.6
2322
- lsp-test-0.4.0.0
2423
- syz-0.2.0.0
2524
- temporary-1.2.1.1
25+
- windns-0.1.0.0
2626
- yaml-0.8.32
2727
- yi-rope-0.11
28-
- windns-0.1.0.0
2928

3029
flags:
3130
haskell-ide-engine:

stack-8.4.3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
1311
- base-compat-0.9.3
1412
- cabal-helper-0.8.1.0@rev:0
1513
- cabal-plan-0.3.0.0
1614
- constrained-dynamic-0.1.0.0
1715
- ghc-exactprint-0.5.8.2
1816
- haddock-api-2.20.0
1917
- haddock-library-1.6.0
18+
- haskell-lsp-0.8.0.1
19+
- haskell-lsp-types-0.8.0.1
2020
- hsimport-0.8.6
2121
- lsp-test-0.4.0.0
2222
- syz-0.2.0.0

stack-8.4.4.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-12.15 # LTS 12.15 is first to support GHC 8.4.4
1+
resolver: lts-12.16 # LTS 12.15 is first to support GHC 8.4.4
22
packages:
33
- .
44
- hie-plugin-api
@@ -8,15 +8,15 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
1311
- base-compat-0.9.3
1412
- cabal-helper-0.8.1.0@rev:0
1513
- cabal-plan-0.3.0.0
1614
- constrained-dynamic-0.1.0.0
1715
- ghc-exactprint-0.5.8.2
1816
- haddock-api-2.20.0
1917
- haddock-library-1.6.0
18+
- haskell-lsp-0.8.0.1
19+
- haskell-lsp-types-0.8.0.1
2020
- hsimport-0.8.6
2121
- lsp-test-0.4.0.0
2222
- syz-0.2.0.0

stack.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@ extra-deps:
88
- ./submodules/HaRe
99
- ./submodules/ghc-mod
1010
- ./submodules/ghc-mod/core
11-
- ./submodules/haskell-lsp
12-
- ./submodules/haskell-lsp/haskell-lsp-types
11+
1312
- aeson-1.3.1.1
1413
- base-compat-0.9.3
1514
- base-orphans-0.7
16-
# - brittany-0.11.0.0
1715
- cabal-helper-0.8.1.0@rev:0
1816
- cabal-plan-0.3.0.0
1917
- constrained-dynamic-0.1.0.0
20-
- ekg-wai-0.1.0.3
2118
- ekg-json-0.1.0.6
22-
# - ghc-exactprint-0.5.8.0
19+
- ekg-wai-0.1.0.3
2320
- haddock-api-2.20.0
24-
- haddock-library-1.6.0
2521
- hsimport-0.8.6
26-
- monad-memo-0.4.1
2722
- lsp-test-0.4.0.0
23+
- monad-memo-0.4.1
2824
- semigroupoids-5.2.2
2925
- syz-0.2.0.0
3026
- temporary-1.2.1.1

0 commit comments

Comments
 (0)