From 58407c292e57acf845622506fd7f51c97d96d340 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 29 Nov 2016 13:51:02 +0200 Subject: [PATCH] Fix a build failure --- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/Devel.hs | 4 ++-- yesod-bin/yesod-bin.cabal | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 304a1867..537b3eef 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.5.0.1 + +* Fix build failure + ## 1.5.0 Rewrite of `yesod devel` to take advantage of Stack for a simpler codebase. diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 9eb56fb5..67771717 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -320,8 +320,8 @@ devel opts passThroughArgs = do -- make sure that all content to stdout or stderr from the build -- process is piped to the actual stdout and stderr handles. withProcess_ procConfig $ \p -> do - let helper getter h = runConduit - $ getter p + let helper getter h = + getter p $$ CL.iterM (\_ -> atomically $ writeTVar appPortVar (-1)) =$ CB.sinkHandle h race_ (helper getStdout stdout) (helper getStderr stderr) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 77177339..e0007d75 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.5.0 +version: 1.5.0.1 license: MIT license-file: LICENSE author: Michael Snoyman