Merge pull request #163 from fendor/fix-shake-yaml

Remove last occurrences of shake.yaml

Author: jneira

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

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 ()