From 5a5cd8127607b034cb032baf9b404938454b1f4e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 19 Dec 2017 11:53:41 +0200 Subject: [PATCH] Support typed-process-0.2.0.0 (fixes #1467) --- stack.yaml | 4 ++++ yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/Devel.hs | 2 +- yesod-bin/yesod-bin.cabal | 5 ++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/stack.yaml b/stack.yaml index 213e9db3..043ac48d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,3 +13,7 @@ packages: - ./yesod - ./yesod-eventsource - ./yesod-websockets +extra-deps: +- conduit-extra-1.2.2 +- unliftio-core-0.1.0.0 +- typed-process-0.2.0.0 diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 1380e9af..0020b34a 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.5.3 + +* Support typed-process-0.2.0.0 + ## 1.5.2.6 * Drop an upper bound diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 18de9347..4579064b 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -61,7 +61,7 @@ import System.FilePath (takeDirectory, import System.FSNotify import System.IO (stdout, stderr) import System.IO.Error (isDoesNotExistError) -import System.Process.Typed +import Data.Conduit.Process.Typed -- We have two special files: -- diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index cb8acaa0..64f9b818 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.5.2.6 +version: 1.5.3 license: MIT license-file: LICENSE author: Michael Snoyman @@ -49,7 +49,7 @@ executable yesod , split >= 0.2 && < 0.3 , file-embed , conduit >= 1.2 - , conduit-extra + , conduit-extra >= 1.2.2 , resourcet >= 0.3 && < 1.2 , base64-bytestring , lifted-base @@ -71,7 +71,6 @@ executable yesod , warp-tls >= 3.0.1 , async , deepseq - , typed-process ghc-options: -Wall -threaded -rtsopts main-is: main.hs