Merge branch 'release' into stable

Author: borsboom

src/Control/Concurrent/Execute.hs

@@ -11,7 +11,7 @@ module Control.Concurrent.Execute
     , runActions
     ) where
 
-import           Control.Concurrent.STM
+import           Control.Concurrent.STM   (retry)
 import           Stack.Prelude
 import qualified Data.Set                 as Set
 import           Stack.Types.PackageIdentifier

src/Network/HTTP/Download/Verified.hs

@@ -49,7 +49,6 @@ import              Stack.Types.Runner
 import              Stack.PrettyPrint
 import              System.Directory
 import qualified    System.FilePath as FP ((<.>))
-import              System.IO (hFileSize)
 
 -- | A request together with some checks to perform.
 data DownloadRequest = DownloadRequest

src/Stack/Build/Execute.hs

@@ -24,7 +24,7 @@ module Stack.Build.Execute
     ) where
 
 import           Control.Concurrent.Execute
-import           Control.Concurrent.STM
+import           Control.Concurrent.STM (check)
 import           Stack.Prelude
 import           Crypto.Hash
 import           Data.Attoparsec.Text hiding (try)
@@ -84,7 +84,7 @@ import qualified System.Directory as D
 import           System.Environment (getExecutablePath)
 import           System.Exit (ExitCode (ExitSuccess))
 import qualified System.FilePath as FP
-import           System.IO
+import           System.IO (hPutStr, openBinaryFile)
 import           System.PosixCompat.Files (createLink)
 import           System.Process.Log (showProcessArgDebug, withProcessTimeLog)
 import           System.Process.Read

src/Stack/Docker.hs

@@ -58,7 +58,7 @@ import           System.Directory (canonicalizePath,getHomeDirectory)
 import           System.Environment (getEnv,getEnvironment,getProgName,getArgs,getExecutablePath)
 import           System.Exit (exitSuccess, exitWith, ExitCode(..))
 import qualified System.FilePath as FP
-import           System.IO (stderr,stdin,stdout,hIsTerminalDevice, hClose)
+import           System.IO (stderr,stdin,stdout)
 import           System.IO.Error (isDoesNotExistError)
 import           System.IO.Unsafe (unsafePerformIO)
 import qualified System.PosixCompat.User as User

src/Stack/Fetch.hs

@@ -33,7 +33,6 @@ import qualified    Codec.Archive.Tar as Tar
 import qualified    Codec.Archive.Tar.Check as Tar
 import qualified    Codec.Archive.Tar.Entry as Tar
 import              Codec.Compression.GZip (decompress)
-import              Control.Concurrent.STM
 import              Stack.Prelude
 import              Crypto.Hash (SHA256 (..))
 import qualified    Data.ByteString as S
@@ -62,7 +61,7 @@ import              Stack.Types.PackageName
 import              Stack.Types.Runner
 import              Stack.Types.Version
 import qualified    System.FilePath as FP
-import              System.IO (hSeek, SeekMode (AbsoluteSeek))
+import              System.IO (SeekMode (AbsoluteSeek))
 import              System.PosixCompat (setFileMode)
 
 data FetchException

src/Stack/FileWatch.hs

@@ -9,13 +9,12 @@ module Stack.FileWatch
 
 import Blaze.ByteString.Builder (toLazyByteString, copyByteString)
 import Blaze.ByteString.Builder.Char.Utf8 (fromShow)
-import Control.Concurrent.STM
+import Control.Concurrent.STM (check)
 import Stack.Prelude
 import qualified Data.ByteString.Lazy as L
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import GHC.IO.Exception
-import GHC.IO.Handle (hIsTerminalDevice)
 import Path
 import System.Console.ANSI
 import System.FSNotify

src/Stack/Ghci/Script.hs

@@ -21,7 +21,7 @@ import qualified Data.Set as S
 import           Data.Text.Encoding (encodeUtf8Builder)
 import           Path
 import           Stack.Prelude hiding (ByteString)
-import           System.IO (hSetBuffering, BufferMode (..), hSetBinaryMode)
+import           System.IO (BufferMode (..), hSetBinaryMode)
 
 import           Distribution.ModuleName hiding (toFilePath)
 

src/Stack/Setup.hs

@@ -94,7 +94,7 @@ import              Stack.Types.Version
 import qualified    System.Directory as D
 import              System.Environment (getExecutablePath, lookupEnv)
 import              System.Exit (ExitCode (..), exitFailure)
-import              System.IO (hFlush, stdout)
+import              System.IO (stdout)
 import              System.IO.Error (isPermissionError)
 import              System.FilePath (searchPathSeparator)
 import qualified    System.FilePath as FP

src/Stack/Types/Runner.hs

@@ -46,7 +46,7 @@ import           Stack.Constants
 import           Stack.Types.PackageIdentifier (PackageIdentifierRevision)
 import           System.Console.ANSI
 import           System.FilePath
-import           System.IO
+import           System.IO                  (localeEncoding)
 import           System.Log.FastLogger
 import           System.Terminal
 

src/Stack/Upload.hs

@@ -47,7 +47,7 @@ import           Stack.Types.PackageName               (packageNameString)
 import           System.Directory                      (createDirectoryIfMissing,
                                                         removeFile)
 import           System.FilePath                       ((</>), takeFileName)
-import           System.IO                             (hFlush, stdout, putStrLn, putStr, getLine, print) -- TODO remove putStrLn, use logInfo
+import           System.IO                             (stdout, putStrLn, putStr, getLine, print) -- TODO remove putStrLn, use logInfo
 import           System.IO.Echo                        (withoutInputEcho)
 
 -- | Username and password to log into Hackage.