Snapshot and dependency updates

borsboom · borsboom · commit 8acaa79a1b4b · 2019-07-12T10:46:05.000-07:00
Note: this upgrades `rio` and switches to `readProcessWait` and
`readProcessWait_`.
diff --git a/snapshot-lts-12.yaml b/snapshot-lts-12.yaml
@@ -9,11 +9,12 @@ packages:
 - yaml-0.10.4.0@rev:0 #for hpack-0.31
 - persistent-2.9.2@rev:0
 - persistent-sqlite-2.9.3@rev:0
-- rio-0.1.9.2@rev:0
+- rio-0.1.10.0@rev:0
 - ansi-terminal-0.9@rev:0
 - ansi-wl-pprint-0.6.8.2@rev:1 # for ansi-terminal-0.9
 - hedgehog-0.6.1@rev:4 # for ansi-terminal-0.9
 - optparse-simple-0.1.1.2
+- typed-process-0.2.6.0@rev:0 # for rio-0.1.10.0
 - git: https://github.com/snoyberg/filelock.git
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 
diff --git a/snapshot-nightly.yaml b/snapshot-nightly.yaml
@@ -1,12 +1,14 @@
-resolver: nightly-2019-06-06
+resolver: nightly-2019-07-11
 name: snapshot-for-building-stack-with-ghc-8.6.5
 
 packages:
 - amazonka-1.6.1@rev:0
 - amazonka-s3-1.6.1@rev:0
 - amazonka-core-1.6.1@rev:0
   # For amazonka-1.6.1 (check for amazonka update allowing http-client-0.6)
+  # Once fixed, remove bounds from `package.yaml` (also under `subs`)
 - http-client-0.5.14@rev:0
+- cryptonite-0.26@rev:0
 - git: https://github.com/snoyberg/filelock.git
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 
diff --git a/snapshot.yaml b/snapshot.yaml
@@ -19,9 +19,10 @@ packages:
 - process-1.6.3.0@sha256:fc77cfe75a9653b8c54ae455ead8c06cb8adc4d7a340984d84d8ca880b579919,2370 #because of https://github.com/haskell/process/pull/101
 - persistent-2.9.2@rev:0
 - persistent-sqlite-2.9.3@rev:0
-- rio-0.1.9.2@rev:0
+- rio-0.1.10.0@rev:0
 - ansi-wl-pprint-0.6.8.2@rev:1 # for ansi-terminal-0.9
 - hedgehog-0.6.1@rev:4 # for ansi-terminal-0.9
+- typed-process-0.2.6.0@rev:0 # for rio-0.1.10.0
 - git: https://github.com/snoyberg/filelock.git
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -1656,7 +1656,7 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap
                 ec
                   <- withWorkingDir (toFilePath eeTempDir)
                    $ proc "haddock" ["--hyperlinked-source"]
-                   $ \pc -> withProcess
+                   $ \pc -> withProcessWait
                      (setStdout createSource $ setStderr createSource pc) $ \p ->
                        runConcurrently
                          $ Concurrently (runConduit $ getStdout p .| CL.sinkNull)
@@ -2026,7 +2026,7 @@ singleTest topts testsToRun ac ee task installedMap = do
                                    $ setStdout output
                                    $ setStderr output
                                      pc0
-                            withProcess pc $ \p -> do
+                            withProcessWait pc $ \p -> do
                               case (getStdout p, getStderr p) of
                                 (Nothing, Nothing) -> pure ()
                                 (Just x, Just y) -> concurrently_ x y
diff --git a/src/Stack/Prelude.hs b/src/Stack/Prelude.hs
@@ -40,7 +40,7 @@ import           System.IO.Echo (withoutInputEcho)
 import qualified Data.Conduit.Binary as CB
 import qualified Data.Conduit.List as CL
 import           Data.Conduit.Process.Typed (withLoggedProcess_, createSource, byteStringInput)
-import           RIO.Process (HasProcessContext (..), ProcessContext, setStdin, closed, getStderr, getStdout, proc, withProcess_, setStdout, setStderr, ProcessConfig, readProcess_, workingDirL, waitExitCode)
+import           RIO.Process (HasProcessContext (..), ProcessContext, setStdin, closed, getStderr, getStdout, proc, withProcessWait_, setStdout, setStderr, ProcessConfig, readProcess_, workingDirL, waitExitCode)
 import           Data.Text.Encoding (decodeUtf8With)
 import           Data.Text.Encoding.Error (lenientDecode)
 
@@ -79,7 +79,7 @@ sinkProcessStderrStdout name args sinkStderr sinkStdout =
            -- See https://github.com/commercialhaskell/stack/pull/4722
            $ setStdin (byteStringInput "")
              pc0
-    withProcess_ pc $ \p ->
+    withProcessWait_ pc $ \p ->
       (runConduit (getStderr p .| sinkStderr) `concurrently`
       runConduit (getStdout p .| sinkStdout)) <* waitExitCode p
 
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -1561,7 +1561,7 @@ setup7z si = do
                 ec <-
                   proc cmd args $ \pc ->
                   if isExtract
-                    then withProcess (setStdout createSource pc) $ \p -> do
+                    then withProcessWait (setStdout createSource pc) $ \p -> do
                         total <- runConduit
                             $ getStdout p
                            .| filterCE (== 10) -- newline characters
