Fail if cabal update fails (#93)

input-output-hk · Feb 14, 2018 · b614c56 · b614c56
1 parent 486a88f
commit b614c56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/Stack2nix.hs b/src/Stack2nix.hs
@@ -13,7 +13,7 @@ import           Data.Maybe                 (isJust)
 import           Data.Monoid                ((<>))
 import           Paths_stack2nix            (version)
 import           Stack2nix.External.Stack
-import           Stack2nix.External.Util    (runCmdFrom)
+import           Stack2nix.External.Util    (runCmdFrom, failHard)
 import           Stack2nix.External.VCS.Git (Command (..), ExternalCmd (..),
                                              InternalCmd (..), git)
 import           Stack2nix.Types            (Args (..))
@@ -46,8 +46,10 @@ stack2nix args@Args{..} = do
     tryGit tmpDir >> handleStackConfig (Just argUri) tmpDir
   where
     updateCabalPackageIndex :: IO ()
-    updateCabalPackageIndex =
-      getEnv "HOME" >>= \home -> void $ runCmdFrom home "cabal" ["update"]
+    updateCabalPackageIndex = do
+      home <- getEnv "HOME"
+      out <- runCmdFrom home "cabal" ["update"]
+      void $ failHard out
 
     tryGit :: FilePath -> IO ()
     tryGit tmpDir = do

diff --git a/src/Stack2nix/External/Stack.hs b/src/Stack2nix/External/Stack.hs
@@ -6,7 +6,6 @@ module Stack2nix.External.Stack
   ( PackageRef(..), runPlan
   ) where
 
-import           Control.Applicative           ((<|>))
 import           Data.List                     (concat)
 import qualified Data.Map.Strict               as M
 import           Data.Maybe                    (fromJust)
@@ -112,7 +111,6 @@ runPlan baseDir remoteUri args@Args{..} = do
   ensureExecutable ("haskell.compiler.ghc" ++ ghcnixversion)
   withBuildConfig globals $ planAndGenerate buildOpts baseDir remoteUri args ghcnixversion
 
-
 getGhcVersionIO :: GlobalOpts -> FilePath -> IO (CompilerVersion 'CVWanted)
 getGhcVersionIO go stackFile = do
   cp <- canonicalizePath stackFile
@@ -122,13 +120,6 @@ getGhcVersionIO go stackFile = do
     runRIO runner $ loadConfig mempty Nothing (SYLOverride fp)
   loadCompilerVersion go lc
 
-{-
-  TODO:
-  - replace "ghc" in package list with value encoding compiler version
-  - handle custom shell.nix  (see mshellFile in Stack.Nix.runShellAndExit)
-  - remove baseDir arguments; due to withCurrentDirectory it should always be PWD.
--}
-
 globalOpts :: FilePath -> FilePath -> Args -> GlobalOpts
 globalOpts currentDir stackRoot Args{..} =
   go { globalReExecVersion = Just "1.5.1" -- TODO: obtain from stack lib if exposed