Skip to content

Commit 224928d

Browse files
authored
Merge pull request #35 from jneira/installhs-cabal-wrapper
Add wrapper to cabal install target
2 parents f853886 + 2de3de8 commit 224928d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ _build/
1010

1111
# stack 2.1 stack.yaml lock files
1212
stack*.yaml.lock
13-
shake.yaml.lock
13+
shake.yaml.lock
14+
15+
.vscode

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ write-ghc-environment-files: never
1414
-- pre-brexit
1515
-- A later version (2020-02-01T08:48:32Z) has a problem with a diamond
1616
-- dependency for cabal-helper and cabal-plan
17-
index-state: 2020-01-31T22:59:59Z
17+
index-state: 2020-01-31T21:11:24Z

install/src/Cabal.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ cabalInstallHie versionNumber = do
6363
installMethod | isWindowsSystem && isCabal3 = ["--install-method=copy"]
6464
| otherwise = []
6565
execCabal_ $
66-
[ "v2-install", "exe:haskell-language-server"
66+
[ "v2-install"
67+
, "exe:haskell-language-server"
68+
, "exe:haskell-language-server-wrapper"
6769
, "-w", ghcPath
6870
, "--write-ghc-environment-files=never"
6971
, installDirOpt, localBin
7072
, "--max-backjumps=5000"
71-
, "exe:haskell-language-server"
7273
, "--overwrite-policy=always"
7374
]
7475
++ installMethod

0 commit comments

Comments
 (0)