stack 1.6.1 → 1.6.1.1

raw patch · 18 files changed

+19/−22 lines, 18 filesdep ~conduit-extradep ~extradep ~generic-deriving

Dependency ranges changed: conduit-extra, extra, generic-deriving, hpack, memory, mono-traversable, persistent-sqlite, resourcet, retry, smallcheck, unliftio

Files

package.yaml +1/−1
src/Control/Concurrent/Execute.hs +1/−1
src/Network/HTTP/Download/Verified.hs +0/−1
src/Stack/Build/Execute.hs +2/−2
src/Stack/Docker.hs +1/−1
src/Stack/Fetch.hs +1/−2
src/Stack/FileWatch.hs +1/−2
src/Stack/Ghci/Script.hs +1/−1
src/Stack/Setup.hs +1/−1
src/Stack/Types/Runner.hs +1/−1
src/Stack/Upload.hs +1/−1
src/System/Process/PagerEditor.hs +1/−1
src/System/Process/Read.hs +0/−1
src/System/Process/Run.hs +1/−1
src/main/Main.hs +1/−1
src/test/Stack/StoreSpec.hs +1/−1
stack.cabal +2/−2
stack.yaml +2/−1

package.yaml view

@@ -1,5 +1,5 @@ name: stack-version: '1.6.1'+version: '1.6.1.1' synopsis: The Haskell Tool Stack description: ! 'Please see the README.md for usage information, and   the wiki on Github for more details.  Also, note that

src/Control/Concurrent/Execute.hs view

@@ -11,7 +11,7 @@     , 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 view

@@ -49,7 +49,6 @@ 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 view

@@ -24,7 +24,7 @@     ) 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           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 view

@@ -58,7 +58,7 @@ 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 view

@@ -33,7 +33,6 @@ 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.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 view

@@ -9,13 +9,12 @@  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 view

@@ -21,7 +21,7 @@ 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 view

@@ -94,7 +94,7 @@ 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 view

@@ -46,7 +46,7 @@ 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 view

@@ -47,7 +47,7 @@ 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.

src/System/Process/PagerEditor.hs view

@@ -28,7 +28,7 @@ import System.FilePath ((</>)) import System.Process (createProcess,shell,proc,waitForProcess,StdStream (CreatePipe)                       ,CreateProcess(std_in, close_fds, delegate_ctlc))-import System.IO (hClose,hPutStr,readFile,stdout)+import System.IO (hPutStr,readFile,stdout)  -- | Run pager, providing a function that writes to the pager's input. pageWriter :: (Handle -> IO ()) -> IO ()

src/System/Process/Read.hs view

@@ -57,7 +57,6 @@ import           System.Environment (getEnvironment) import           System.Exit import qualified System.FilePath as FP-import           System.IO (hClose) import           System.Process.Log  -- | Override the environment received by a child process.

src/System/Process/Run.hs view

@@ -23,7 +23,7 @@ import           Data.Conduit.Process hiding (callProcess) import qualified Data.Text as T import           System.Exit (exitWith, ExitCode (..))-import           System.IO+import           System.IO (hGetLine) import qualified System.Process import           System.Process.Log import           System.Process.Read

src/main/Main.hs view

@@ -105,7 +105,7 @@ import           System.Environment (getProgName, getArgs, withArgs) import           System.Exit import           System.FilePath (isValid, pathSeparator)-import           System.IO (hIsTerminalDevice, stderr, stdin, stdout, hSetBuffering, BufferMode(..), hPutStrLn, hGetEncoding, hSetEncoding)+import           System.IO (stderr, stdin, stdout, BufferMode(..), hPutStrLn, hGetEncoding, hSetEncoding)  -- | Change the character encoding of the given Handle to transliterate -- on unsupported characters instead of throwing an exception

src/test/Stack/StoreSpec.hs view

@@ -51,7 +51,7 @@     (if (minBound :: a) `notElem` xs then [minBound] else []) ++     (if (maxBound :: a) `notElem` xs && (maxBound :: a) /= minBound then maxBound : xs else xs) -$(do let ns = [ ''Int64, ''Word64, ''Word, ''Word8+$(do let ns = [ ''Int64, ''Word64, ''Word8               ]          f n = [d| instance Monad m => Serial m $(conT n) where                       series = generate (\_ -> addMinAndMaxBounds [0, 1]) |]

stack.cabal view

@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: d149de7c99c88786c765e40f4d0f24a47010c288e64c6cb556d989a04a0df537+-- hash: de62cea79534de3d9c9e0479c0650a4159c588e37a8ae05df6dab12a1a5f0c46  name:           stack-version:        1.6.1+version:        1.6.1.1 synopsis:       The Haskell Tool Stack description:    Please see the README.md for usage information, and the wiki on Github for more details.  Also, note that the API for the library is not currently stable, and may change significantly, even between minor releases. It is currently only intended for use by the executable. category:       Development

stack.yaml view

@@ -26,6 +26,7 @@ - extra-1.6 - hsc2hs-0.68.2 - hpack-0.20.0-- unliftio-0.2.0.0+- unliftio-0.2.1.0 - ansi-terminal-0.7.1.1 - ansi-wl-pprint-0.6.8.1+- smallcheck-1.1.3