Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove last occurrences of shake.yaml #163

Merged
merged 1 commit into from
Jun 14, 2020
Merged

Remove last occurrences of shake.yaml #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cd haskell-language-server
#### Building

Note, on first invocation of the build script with stack, a GHC is being installed for execution.
The GHC used for the `install.hs` can be adjusted in `./install/shake.yaml` by using a different resolver.
The GHC used for the `install.hs` can be adjusted in `./install/stack.yaml` by using a different resolver.

Available commands can be seen with:

Expand Down Expand Up @@ -500,7 +500,7 @@ args = ["--lsp"]
Haskell-language-server can be used on itself. We provide
preset samples of `hie.yaml` for Cabal and Stack.

Note: the `./install/` folder is not directly tied to the project so it has dedicated `./install/hie.yaml.[cbl|stack]`
Note: the `./install/` folder is not directly tied to the project so it has dedicated `./install/hie.yaml.[cbl|stack]`
templates.

#### Using Cabal
Expand Down
4 changes: 2 additions & 2 deletions install/src/Stack.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stackInstallHls mbVersionNumber args = do
versionNumber <-
case mbVersionNumber of
Nothing -> do
execStackWithCfgFile_ "stack.yaml" $
execStackWithCfgFile_ "stack.yaml" $
["install"
, ":haskell-language-server-wrapper"
, ":haskell-language-server"] ++ args
Expand Down Expand Up @@ -84,7 +84,7 @@ execStackWithCfgFile stackFile args =

-- | Execute a stack command with the same resolver as the build script
execStackShake :: CmdResult r => [String] -> Action r
execStackShake args = command [] "stack" ("--stack-yaml=install/shake.yaml" : args)
execStackShake args = command [] "stack" ("--stack-yaml=install/stack.yaml" : args)

-- | Execute a stack command with the same resolver as the build script, discarding the output
execStackShake_ :: [String] -> Action ()
Expand Down