git.iko.soy/stackage
on bf52f1d help sign in
stackage/patching/patches/process-conduit-1.0.0.2.patch
62 lines 2.4 kB history raw
1diff -ru orig/Data/Conduit/Process.hs new/Data/Conduit/Process.hs
2--- orig/Data/Conduit/Process.hs 2014-04-03 08:26:07.254383579 +0300
3+++ new/Data/Conduit/Process.hs 2014-04-03 08:26:06.000000000 +0300
4@@ -21,6 +21,7 @@
5 import Control.Monad
6 import Control.Monad.Trans
7 import Control.Monad.Trans.Loop
8+import Control.Monad.Trans.Resource (MonadResource, monadThrow)
9 import qualified Data.ByteString as S
10 import Data.Conduit
11 import qualified Data.Conduit.List as CL
12diff -ru orig/process-conduit.cabal new/process-conduit.cabal
13--- orig/process-conduit.cabal 2014-04-03 08:26:07.258383579 +0300
14+++ new/process-conduit.cabal 2014-04-03 08:26:06.000000000 +0300
15@@ -33,7 +33,8 @@
16 , bytestring >= 0.9
17 , text >= 0.11
18 , process >= 1.0
19- , conduit == 1.0.*
20+ , conduit >= 1.0 && < 1.2
21+ , resourcet >= 0.4 && < 1.2
22 , shakespeare-text >= 1.0
23 , shakespeare
25@@ -47,4 +48,6 @@
26 , bytestring
27 , hspec >= 1.3
28 , conduit
29+ , conduit-extra
30+ , resourcet
31 , process-conduit
32diff -ru orig/System/Process/QQ.hs new/System/Process/QQ.hs
33--- orig/System/Process/QQ.hs 2014-04-03 08:26:07.254383579 +0300
34+++ new/System/Process/QQ.hs 2014-04-03 08:26:06.000000000 +0300
35@@ -14,6 +14,7 @@
36 import qualified Data.Text.Lazy as LT
37 import Language.Haskell.TH.Quote
38 import Text.Shakespeare.Text
39+import Control.Monad.Trans.Resource (runResourceT)
41 import Data.Conduit.Process
43@@ -28,7 +29,7 @@
44 -- | Command result of (Lazy) ByteString.
45 cmd :: QuasiQuoter
46 cmd = def { quoteExp = \str -> [|
47- BL.fromChunks <$> C.runResourceT (sourceCmd (LT.unpack $(quoteExp lt str)) C.$$ CL.consume)
48+ BL.fromChunks <$> runResourceT (sourceCmd (LT.unpack $(quoteExp lt str)) C.$$ CL.consume)
49 |] }
51 -- | Source of shell command
52diff -ru orig/test.hs new/test.hs
53--- orig/test.hs 2014-04-03 08:26:07.254383579 +0300
54+++ new/test.hs 2014-04-03 08:26:06.000000000 +0300
55@@ -7,6 +7,7 @@
56 import Data.Conduit
57 import qualified Data.Conduit.Binary as CB
58 import Test.Hspec
59+import Control.Monad.Trans.Resource (runResourceT)
61 main :: IO ()
62 main = hspec $ do