@@ -14,7 +14,7 @@ module Obelisk.Command.Run where
1414import Control.Arrow ((&&&))
1515import Control.Exception (Exception, bracket)
1616import Control.Lens (ifor, (.~), (&))
17−import Control.Monad (filterM)
17+import Control.Monad (filterM, unless)
1818import Control.Monad.Except (runExceptT, throwError)
1919import Control.Monad.IO.Class (liftIO)
2020import Control.Monad.Reader (MonadIO)
@@ -304,16 +304,15 @@ parseCabalPackage
304304 -> m (Maybe CabalPackageInfo)
305305parseCabalPackage dir = parseCabalPackage' dir >>= \case
306306 Left err -> Nothing <$ putLog Error err
307− Right (Just (warnings, pkgInfo)) -> do
307+ Right (warnings, pkgInfo) -> do
308308 for_ warnings $ putLog Warning . T.pack . show
309309 pure $ Just pkgInfo
310− Right Nothing -> pure Nothing
311310
312311-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
313312parseCabalPackage'
314313 :: (MonadIO m)
315314 => FilePath -- ^ Package directory
316− -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
315+ -> m (Either T.Text ([Dist.PWarning], CabalPackageInfo))
317316parseCabalPackage' pkg = runExceptT $ do
318317 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
319318 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -341,7 +340,7 @@ parseCabalPackage' pkg = runExceptT $ do
341340 case condLibrary <$> result of
342341 Right (Just condLib) -> do
343342 let (_, lib) = simplifyCondTree evalConfVar condLib
344− pure $ Just $ (warnings,) $ CabalPackageInfo
343+ pure $ (warnings,) $ CabalPackageInfo
345344 { _cabalPackageInfo_packageName = T.pack packageName
346345 , _cabalPackageInfo_packageFile = packageFile
347346 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
@@ -355,17 +354,17 @@ parseCabalPackage' pkg = runExceptT $ do
355354 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
356355 , _cabalPackageInfo_cppOptions = cppOptions $ libBuildInfo lib
357356 }
358− Right Nothing -> pure Nothing
357+ Right Nothing -> throwError "Haskell package has no library component"
359358 Left (_, errors) ->
360359 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
361360
362361parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
363362parsePackagesOrFail dirs' = do
364− packageInfos' <- fmap catMaybes $ for dirs $ \dir -> do
363+ (pkgDirErrs, packageInfos') <- fmap partitionEithers $ for dirs $ \dir -> do
365364 flip fmap (parseCabalPackage dir) $ \case
366365 Just packageInfo
367− | _cabalPackageInfo_buildable packageInfo -> Just packageInfo
368− _ -> Nothing
366+ | _cabalPackageInfo_buildable packageInfo -> Right packageInfo
367+ _ -> Left dir
369368
370369 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
371370 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
@@ -387,6 +386,9 @@ parsePackagesOrFail dirs' = do
387386 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
388387 Just xs -> pure xs
389388
389+ unless (null pkgDirErrs) $
390+ putLog Warning $ T.pack $ "Failed to find buildable packages in " <> intercalate ", " pkgDirErrs
391+
390392 pure packageInfos
391393 where
392394 dirs = toList dirs'