branch: elpa/haskell-tng-mode
commit 3870bf1d53f12c9b9d0ef578aa29c5f1c3e1ddbe
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
time to remove the cabal v2- prefixes
---
README.md | 4 ++--
haskell-tng-compile.el | 7 ++++---
haskell-tng-extra.el | 2 +-
test/haskell-tng-compile-test.el | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 49fa1e8..e684835 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ Integrations are provided for common libraries and external
applications.
The installation instructions above enable all the integrations. Remove the
`require` lines for packages that are unwanted.
-Third party Haskell tools must be installed separately (e.g. via `cabal
v2-install`):
+Third party Haskell tools must be installed separately (e.g. via `cabal
install`):
- [`stack2cabal`](https://hackage.haskell.org/package/stack2cabal)
- [`stylish-haskell`](https://hackage.haskell.org/package/stylish-haskell)
@@ -166,7 +166,7 @@ This is the status of core features:
- `:doc` at point
- expand type definitions (e.g. to show full ADT)
- [`flycheck`](http://www.flycheck.org/en/latest/) integration with
`haskell-compile`
- - `ghc` / `cabal v2-exec ghc --` for red squiggles, getting the correct info
from [`cabal-helper`](http://hackage.haskell.org/package/cabal-helper)
+ - `ghc` / `cabal exec ghc --` for red squiggles, getting the correct info
from [`cabal-helper`](http://hackage.haskell.org/package/cabal-helper)
- and [`hlint`](https://github.com/ndmitchell/hlint)
- and for faster feedback, [`ghcid`](https://github.com/ndmitchell/ghcid)
- [visualise values as
types](https://twitter.com/jyothsnasrin/status/1039530556080283648)
diff --git a/haskell-tng-compile.el b/haskell-tng-compile.el
index ee8b21e..20b8e56 100644
--- a/haskell-tng-compile.el
+++ b/haskell-tng-compile.el
@@ -65,10 +65,11 @@
"The `compilation-error-regexp-alist' for `haskell-tng'.")
(defvar haskell-tng--compile-history
- '("cabal v2-build"
- "cabal v2-run tasty -- "))
+ '("cabal build"
+ "cabal run tasty -- "
+ "cabal run hspec -- "))
(defvar-local haskell-tng--compile-command nil)
-(defvar-local haskell-tng--compile-alt "cabal v2-clean")
+(defvar-local haskell-tng--compile-alt "cabal clean")
(defvar haskell-tng--compile-dominating-package
(rx (| (: (+ any) ".cabal") "package.yaml")))
diff --git a/haskell-tng-extra.el b/haskell-tng-extra.el
index 1037c99..c6d8d68 100644
--- a/haskell-tng-extra.el
+++ b/haskell-tng-extra.el
@@ -13,7 +13,7 @@
;;; Code:
;; TODO a generic wrapper around commands that can be downloaded and built
using
-;; cabal v2-install.
+;; cabal install.
;; TODO cabal-fmt on new file creation (for the `insert' support). Maybe with a
;; hook in both `before-save-hook' (detecting that the file is new) and
diff --git a/test/haskell-tng-compile-test.el b/test/haskell-tng-compile-test.el
index 823a4bf..18ee191 100644
--- a/test/haskell-tng-compile-test.el
+++ b/test/haskell-tng-compile-test.el
@@ -43,7 +43,7 @@
;;(kill-line -2)
))
-;; cabal v2-clean && cabal v2-build -O0 all > ghc-8.4.4-error.compile 2>&1
+;; cabal clean && cabal build -O0 all > ghc-8.4.4-error.compile 2>&1
(ert-deftest haskell-tng-compile-errors-file-tests ()
(should (have-expected-errors (testdata "compile/ghc-8.4.4-error.compile")))
(should (have-expected-errors (testdata
"compile/ghc-8.4.4-errorspan.compile"))))
