From 04e58a0e0e495c1c09a8756185f45da95174b510 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Thu, 9 May 2019 12:19:59 +0100 Subject: [PATCH 1/2] Use lsp-test-0.5.2.2 from hackage --- .gitmodules | 3 --- stack-8.2.1.yaml | 3 +-- stack-8.2.2.yaml | 3 +-- stack-8.4.2.yaml | 3 +-- stack-8.4.3.yaml | 3 +-- stack-8.4.4.yaml | 3 +-- stack-8.6.1.yaml | 3 +-- stack-8.6.2.yaml | 3 +-- stack-8.6.3.yaml | 3 +-- stack-8.6.4.yaml | 3 +-- stack-8.6.5.yaml | 3 +-- stack.yaml | 3 +-- submodules/lsp-test | 1 - 13 files changed, 11 insertions(+), 26 deletions(-) delete mode 160000 submodules/lsp-test diff --git a/.gitmodules b/.gitmodules index b45a04c07..9605b4590 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "submodules/haskell-lsp"] path = submodules/haskell-lsp url = https://github.com/alanz/haskell-lsp.git -[submodule "submodules/lsp-test"] - path = submodules/lsp-test - url = https://github.com/alanz/lsp-test.git diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index f9968a904..c1db403ff 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test # - brittany-0.11.0.0 - butcher-1.3.1.1 @@ -27,7 +26,7 @@ extra-deps: # - haskell-lsp-types-0.12.1.0 - hlint-2.0.11 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - mtl-2.2.2 - pretty-show-1.8.2 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index 828695448..33909f50e 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test # - brittany-0.11.0.0 - butcher-1.3.1.1 @@ -31,7 +30,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 4d59ce727..8c752e62c 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test # - brittany-0.11.0.0 - base-compat-0.9.3 @@ -29,7 +28,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index cae3aecd9..3d00419d4 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - base-compat-0.9.3 - cabal-plan-0.3.0.0 @@ -28,7 +27,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index c337c1eb8..9d2ea176e 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test # - brittany-0.11.0.0 - cabal-plan-0.4.0.0 @@ -28,7 +27,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - optparse-simple-0.1.0 - pretty-show-1.9.5 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index fefb1a395..0f790fe28 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - apply-refact-0.6.0.0 - butcher-1.3.2.1 @@ -30,7 +29,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - monoid-subclasses-0.4.6.1 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index bd72cd991..c4436bbd9 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - butcher-1.3.2.1 - cabal-plan-0.4.0.0 @@ -26,7 +25,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 6f1dae856..c94c5337c 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - butcher-1.3.2.1 - cabal-plan-0.4.0.0 @@ -26,7 +25,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 1ecc13f65..685f98618 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - butcher-1.3.2.1 - cabal-plan-0.4.0.0 @@ -25,7 +24,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 1e04aaa93..bc52b9578 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - ansi-terminal-0.8.2 - butcher-1.3.2.1 @@ -26,7 +25,7 @@ extra-deps: # - haskell-lsp-types-0.12.1.0 - hlint-2.1.17 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack.yaml b/stack.yaml index 1e04aaa93..bc52b9578 100644 --- a/stack.yaml +++ b/stack.yaml @@ -12,7 +12,6 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - ./submodules/haskell-lsp - ./submodules/haskell-lsp/haskell-lsp-types -- ./submodules/lsp-test - ansi-terminal-0.8.2 - butcher-1.3.2.1 @@ -26,7 +25,7 @@ extra-deps: # - haskell-lsp-types-0.12.1.0 - hlint-2.1.17 - hsimport-0.8.8 -# - lsp-test-0.5.2.1 +- lsp-test-0.5.2.2 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/submodules/lsp-test b/submodules/lsp-test deleted file mode 160000 index d54524be6..000000000 --- a/submodules/lsp-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d54524be6dd2b0b2d20530afd7049f22b33129d5 From 971e1563be03ab41d9a05c2f3a506d59a4a21d25 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Thu, 9 May 2019 13:17:43 +0100 Subject: [PATCH 2/2] Update cabal.project --- cabal.project | 1 - 1 file changed, 1 deletion(-) diff --git a/cabal.project b/cabal.project index a1c22cd71..db1f2999b 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,5 @@ packages: ./submodules/ghc-mod/ghc-project-types ./submodules/haskell-lsp ./submodules/haskell-lsp/haskell-lsp-types - ./submodules/lsp-test tests: true