Skip to content

Commit b662e9b

Browse files
committed
Compatible with unliftio-0.2.1.0 and smallcheck-1.1.3
1 parent f258113 commit b662e9b

File tree

18 files changed

+18
-23
lines changed

18 files changed

+18
-23
lines changed

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: stack
2-
version: '1.6.1'
2+
version: '1.6.1.1'
33
synopsis: The Haskell Tool Stack
44
description: ! 'Please see the README.md for usage information, and
55
the wiki on Github for more details. Also, note that

src/Control/Concurrent/Execute.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Control.Concurrent.Execute
1111
, runActions
1212
) where
1313

14-
import Control.Concurrent.STM
14+
import Control.Concurrent.STM (retry)
1515
import Stack.Prelude
1616
import qualified Data.Set as Set
1717
import Stack.Types.PackageIdentifier

src/Network/HTTP/Download/Verified.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import Stack.Types.Runner
4949
import Stack.PrettyPrint
5050
import System.Directory
5151
import qualified System.FilePath as FP ((<.>))
52-
import System.IO (hFileSize)
5352

5453
-- | A request together with some checks to perform.
5554
data DownloadRequest = DownloadRequest

src/Stack/Build/Execute.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module Stack.Build.Execute
2424
) where
2525

2626
import Control.Concurrent.Execute
27-
import Control.Concurrent.STM
27+
import Control.Concurrent.STM (check)
2828
import Stack.Prelude
2929
import Crypto.Hash
3030
import Data.Attoparsec.Text hiding (try)
@@ -84,7 +84,7 @@ import qualified System.Directory as D
8484
import System.Environment (getExecutablePath)
8585
import System.Exit (ExitCode (ExitSuccess))
8686
import qualified System.FilePath as FP
87-
import System.IO
87+
import System.IO (hPutStr, openBinaryFile)
8888
import System.PosixCompat.Files (createLink)
8989
import System.Process.Log (showProcessArgDebug, withProcessTimeLog)
9090
import System.Process.Read

src/Stack/Docker.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import System.Directory (canonicalizePath,getHomeDirectory)
5858
import System.Environment (getEnv,getEnvironment,getProgName,getArgs,getExecutablePath)
5959
import System.Exit (exitSuccess, exitWith, ExitCode(..))
6060
import qualified System.FilePath as FP
61-
import System.IO (stderr,stdin,stdout,hIsTerminalDevice, hClose)
61+
import System.IO (stderr,stdin,stdout)
6262
import System.IO.Error (isDoesNotExistError)
6363
import System.IO.Unsafe (unsafePerformIO)
6464
import qualified System.PosixCompat.User as User

src/Stack/Fetch.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import qualified Codec.Archive.Tar as Tar
3333
import qualified Codec.Archive.Tar.Check as Tar
3434
import qualified Codec.Archive.Tar.Entry as Tar
3535
import Codec.Compression.GZip (decompress)
36-
import Control.Concurrent.STM
3736
import Stack.Prelude
3837
import Crypto.Hash (SHA256 (..))
3938
import qualified Data.ByteString as S
@@ -62,7 +61,7 @@ import Stack.Types.PackageName
6261
import Stack.Types.Runner
6362
import Stack.Types.Version
6463
import qualified System.FilePath as FP
65-
import System.IO (hSeek, SeekMode (AbsoluteSeek))
64+
import System.IO (SeekMode (AbsoluteSeek))
6665
import System.PosixCompat (setFileMode)
6766

6867
data FetchException

src/Stack/FileWatch.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ module Stack.FileWatch
99

1010
import Blaze.ByteString.Builder (toLazyByteString, copyByteString)
1111
import Blaze.ByteString.Builder.Char.Utf8 (fromShow)
12-
import Control.Concurrent.STM
12+
import Control.Concurrent.STM (check)
1313
import Stack.Prelude
1414
import qualified Data.ByteString.Lazy as L
1515
import qualified Data.Map.Strict as Map
1616
import qualified Data.Set as Set
1717
import GHC.IO.Exception
18-
import GHC.IO.Handle (hIsTerminalDevice)
1918
import Path
2019
import System.Console.ANSI
2120
import System.FSNotify

src/Stack/Ghci/Script.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import qualified Data.Set as S
2121
import Data.Text.Encoding (encodeUtf8Builder)
2222
import Path
2323
import Stack.Prelude hiding (ByteString)
24-
import System.IO (hSetBuffering, BufferMode (..), hSetBinaryMode)
24+
import System.IO (BufferMode (..), hSetBinaryMode)
2525

2626
import Distribution.ModuleName hiding (toFilePath)
2727

src/Stack/Setup.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ import Stack.Types.Version
9494
import qualified System.Directory as D
9595
import System.Environment (getExecutablePath, lookupEnv)
9696
import System.Exit (ExitCode (..), exitFailure)
97-
import System.IO (hFlush, stdout)
97+
import System.IO (stdout)
9898
import System.IO.Error (isPermissionError)
9999
import System.FilePath (searchPathSeparator)
100100
import qualified System.FilePath as FP

src/Stack/Types/Runner.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import Stack.Constants
4646
import Stack.Types.PackageIdentifier (PackageIdentifierRevision)
4747
import System.Console.ANSI
4848
import System.FilePath
49-
import System.IO
49+
import System.IO (localeEncoding)
5050
import System.Log.FastLogger
5151
import System.Terminal
5252

0 commit comments

Comments
 (0)