From 37a32b06f295282415f27e7f757ba19d5c5a2def Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 14 Jun 2020 22:13:50 +0200 Subject: [PATCH] Remove last occurrences of shake.yaml --- README.md | 4 ++-- install/src/Stack.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e2a83f310c..92162dde1c 100644 --- a/README.md +++ b/README.md @@ -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: @@ -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 diff --git a/install/src/Stack.hs b/install/src/Stack.hs index 7c71088d33..ea566fa483 100644 --- a/install/src/Stack.hs +++ b/install/src/Stack.hs @@ -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 @@ -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 ()