diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 4acae1a7..5c71fac2 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -88,14 +88,14 @@ lockFile :: FilePath lockFile = "yesod-devel/devel-terminate" writeLock :: DevelOpts -> IO () -writeLock opts = do +writeLock _opts = do createDirectoryIfMissing True "yesod-devel" writeFile lockFile "" createDirectoryIfMissing True "dist" -- for compatibility with old devel.hs writeFile "dist/devel-terminate" "" removeLock :: DevelOpts -> IO () -removeLock opts = do +removeLock _opts = do removeFileIfExists lockFile removeFileIfExists "dist/devel-terminate" -- for compatibility with old devel.hs @@ -138,6 +138,8 @@ defaultDevelOpts = DevelOpts , proxyTimeout = 10 , useReverseProxy = True , terminateWith = TerminateOnEnter + , develConfigOpts = [] + , develEnv = Nothing } cabalProgram :: DevelOpts -> FilePath @@ -197,7 +199,7 @@ reverseProxy opts iappPort = do putStrLn "" loop (race_ httpProxy httpsProxy) `Ex.catch` \e -> do print (e :: Ex.SomeException) - exitFailure + _ <- exitFailure Ex.throwIO e -- heh, just for good measure where loop proxies = forever $ do @@ -524,7 +526,7 @@ lookupLdAr = do lookupLdAr' :: IO (Maybe (FilePath, FilePath)) lookupLdAr' = do -#if MIN_VERSION_Cabal(1,22,0) +#if MIN_VERSION_Cabal(1,18,0) (_, _, pgmc) <- D.configCompilerEx (Just D.GHC) Nothing Nothing D.defaultProgramConfiguration D.silent #else (_, pgmc) <- D.configCompiler (Just D.GHC) Nothing Nothing D.defaultProgramConfiguration D.silent diff --git a/yesod-bin/HsFile.hs b/yesod-bin/HsFile.hs index fa56b6c3..38093a51 100644 --- a/yesod-bin/HsFile.hs +++ b/yesod-bin/HsFile.hs @@ -3,9 +3,9 @@ module HsFile (mkHsFile) where import Text.ProjectTemplate (createTemplate) import Data.Conduit - ( ($$), (=$), ConduitM, awaitForever, yield, Source ) + ( ($$), (=$), awaitForever) import Data.Conduit.Filesystem (sourceDirectory) -import Control.Monad.Trans.Resource (ResourceT, runResourceT) +import Control.Monad.Trans.Resource (runResourceT) import qualified Data.Conduit.List as CL import qualified Data.ByteString as BS import Control.Monad.IO.Class (liftIO) diff --git a/yesod-bin/Keter.hs b/yesod-bin/Keter.hs index 3bd27170..5fcf8ac1 100644 --- a/yesod-bin/Keter.hs +++ b/yesod-bin/Keter.hs @@ -11,7 +11,6 @@ import System.Process import Control.Monad import System.Directory hiding (findFiles) import Data.Maybe (mapMaybe) -import System.Directory (removeDirectoryRecursive) import System.FilePath (()) import qualified Codec.Archive.Tar as Tar import Control.Exception diff --git a/yesod-bin/ghcwrapper.hs b/yesod-bin/ghcwrapper.hs index 8085cb82..172c6eea 100644 --- a/yesod-bin/ghcwrapper.hs +++ b/yesod-bin/ghcwrapper.hs @@ -9,7 +9,7 @@ import Control.Monad (when) import Data.Maybe (fromMaybe) import Distribution.Compiler (CompilerFlavor (..)) -import Distribution.Simple.Configure (configCompiler) +import qualified Distribution.Simple.Configure as D import Distribution.Simple.Program (arProgram, defaultProgramConfiguration, ghcProgram, ldProgram, @@ -44,7 +44,11 @@ outFile = "yesod-devel/ghcargs.txt" runProgram :: Program -> [String] -> IO ExitCode runProgram pgm args = do - (comp, pgmc) <- configCompiler (Just GHC) Nothing Nothing defaultProgramConfiguration silent +#if MIN_VERSION_Cabal(1,18,0) + (_, comp, pgmc) <- D.configCompilerEx (Just GHC) Nothing Nothing defaultProgramConfiguration silent +#else + (comp, pgmc) <- D.configCompiler (Just GHC) Nothing Nothing defaultProgramConfiguration silent +#endif pgmc' <- configureAllKnownPrograms silent pgmc case lookupProgram pgm pgmc' of Nothing -> do