From a180b2b51ffe161922cb8916f8032af325039c9b Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 23 May 2020 22:29:14 +0200 Subject: [PATCH 1/2] Enable dev target for windows --- install/src/HlsInstall.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/src/HlsInstall.hs b/install/src/HlsInstall.hs index 889a8fdff8..13396763da 100644 --- a/install/src/HlsInstall.hs +++ b/install/src/HlsInstall.hs @@ -75,7 +75,7 @@ defaultMain = do -- stack specific targets -- Default `stack.yaml` uses ghc-8.8.2 and we can't build hls in windows -- TODO: Enable for windows when it uses ghc-8.8.3 - when (isRunFromStack && not isWindowsSystem) $ + when isRunFromStack $ phony "dev" $ do need ["show-options"] stackInstallHlsWithErrMsg Nothing args From 1bcd29251d9fb66fcb2c04fc731b5f30cb23bf56 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 23 May 2020 22:30:06 +0200 Subject: [PATCH 2/2] Correct targets of dev stack install --- install/src/Stack.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/src/Stack.hs b/install/src/Stack.hs index 8052b65247..7c71088d33 100644 --- a/install/src/Stack.hs +++ b/install/src/Stack.hs @@ -22,8 +22,8 @@ stackInstallHls mbVersionNumber args = do Nothing -> do execStackWithCfgFile_ "stack.yaml" $ ["install" - , "haskell-language-server-wrapper" - , "haskell-language-server"] ++ args + , ":haskell-language-server-wrapper" + , ":haskell-language-server"] ++ args getGhcVersionOfCfgFile "stack.yaml" args Just vn -> do execStackWithGhc_ vn $ ["install"] ++ args