From e94d23dcb286d978a2c72496bc670ba987ec2495 Mon Sep 17 00:00:00 2001 From: Olle Fredriksson Date: Sat, 24 Aug 2019 21:19:12 +0200 Subject: [PATCH 1/2] Fix cabal comments mentioning stack --- install/src/Cabal.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/src/Cabal.hs b/install/src/Cabal.hs index c06418b71..6727d0cc2 100644 --- a/install/src/Cabal.hs +++ b/install/src/Cabal.hs @@ -66,7 +66,7 @@ installCabal = do -- install `cabal-install` if not already installed unless cabalExeOk $ execStackShake_ ["install", "cabal-install"] --- | check `stack` has the required version +-- | check `cabal` has the required version checkCabal :: Action () checkCabal = do cabalVersion <- getCabalVersion @@ -92,7 +92,7 @@ cabalInstallNotSuportedFailMsg = ++ "If this system has been falsely identified, please open an issue at:\n\thttps://github.com/haskell/haskell-ide-engine\n" --- | Error message when the `stack` binary is an older version +-- | Error message when the `cabal` binary is an older version cabalInstallIsOldFailMsg :: String -> String cabalInstallIsOldFailMsg cabalVersion = "The `cabal` executable is outdated.\n" From 437bb947d3ff4e3ff7b17a06b9bfa949defced16 Mon Sep 17 00:00:00 2001 From: Olle Fredriksson Date: Sat, 24 Aug 2019 21:20:45 +0200 Subject: [PATCH 2/2] Remove cabal check from stack builds Stack should provide its own cabal, so I don't think the system cabal is relevant here. This worked for me despite the check failing. --- install/src/HieInstall.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/install/src/HieInstall.hs b/install/src/HieInstall.hs index 0b7d1e5cf..223dde39b 100644 --- a/install/src/HieInstall.hs +++ b/install/src/HieInstall.hs @@ -102,7 +102,6 @@ defaultMain = do (\version -> phony ("stack-hie-" ++ version) $ do need ["submodules"] need ["check-stack"] - need ["cabal"] stackBuildHie version stackInstallHie version )