Merge pull request #14 from mKarpis/master

conduit patch
kazu-yamamoto · Apr 15, 2014 · fadf5f6 · fadf5f6
2 parents d58f777 + 50b15a3
commit fadf5f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Network/Sendfile/Fallback.hs b/Network/Sendfile/Fallback.hs
@@ -12,6 +12,7 @@ import Network.Sendfile.Types
 import Network.Socket
 import Network.Socket.ByteString
 import qualified Network.Socket.ByteString as SB
+import Control.Monad.Trans.Resource (runResourceT)
 
 -- |
 -- Sendfile emulation using conduit.

diff --git a/simple-sendfile.cabal b/simple-sendfile.cabal
@@ -24,6 +24,7 @@ Library
   Build-Depends:        base >= 4 && < 5
                       , network
                       , bytestring
+                      , resourcet
   -- NetBSD and OpenBSD don't have sendfile
   if os(freebsd) && flag(allow-bsd)
     CPP-Options:        -DOS_BSD
@@ -43,7 +44,8 @@ Library
         Build-Depends:  unix
       else
         Other-Modules:  Network.Sendfile.Fallback
-        Build-Depends:  conduit         >= 0.4.1 && < 1.1
+        Build-Depends:  conduit         >= 1.0 && < 1.2
+                      , conduit-extra   >= 1.0 && < 1.2
                       , transformers    >= 0.2.2 && < 0.4
 
 Test-Suite spec
@@ -57,6 +59,8 @@ Test-Suite spec
                       , HUnit
                       , bytestring
                       , conduit
+                      , conduit-extra
+                      , resourcet
                       , directory
                       , hspec >= 1.3
                       , network