summaryrefslogtreecommitdiff
path: root/src/Network
diff options
context:
space:
mode:
authorSam Truzjan <pxqr.sta@gmail.com>2014-04-26 07:26:36 +0400
committerSam Truzjan <pxqr.sta@gmail.com>2014-04-26 07:26:36 +0400
commit55d59c4857dee7e2ab091405e79854c944c7e7e3 (patch)
tree92ddc89ea3d2d139cab901be232caa5436c0ae42 /src/Network
parentdab822160dbd0b9d4581c13d19f0efb9addc2db6 (diff)
Bump conduit dependency
Diffstat (limited to 'src/Network')
-rw-r--r--src/Network/BitTorrent/Client/Types.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Session.hs3
-rw-r--r--src/Network/BitTorrent/Exchange/Connection.hs1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index a5bf0cce..9bae7dc3 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -100,7 +100,7 @@ externalAddr Client {..} = PeerAddr
100newtype BitTorrent a = BitTorrent 100newtype BitTorrent a = BitTorrent
101 { unBitTorrent :: ReaderT Client IO a 101 { unBitTorrent :: ReaderT Client IO a
102 } deriving ( Functor, Applicative, Monad 102 } deriving ( Functor, Applicative, Monad
103 , MonadIO, MonadThrow, MonadUnsafeIO, MonadBase IO 103 , MonadIO, MonadThrow, MonadBase IO
104 ) 104 )
105 105
106class MonadBitTorrent m where 106class MonadBitTorrent m where
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 0dd4b862..eab25ebb 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -75,6 +75,7 @@ import Control.Monad.Logger
75import Control.Monad.Reader 75import Control.Monad.Reader
76import Control.Monad.Trans.Control 76import Control.Monad.Trans.Control
77import Control.Monad.Trans.Resource 77import Control.Monad.Trans.Resource
78import Data.Conduit.Lazy
78import Data.Default 79import Data.Default
79import Data.Fixed 80import Data.Fixed
80import Data.Hashable 81import Data.Hashable
@@ -256,7 +257,7 @@ newtype DHT ip a = DHT { unDHT :: ReaderT (Node ip) IO a }
256 deriving ( Functor, Applicative, Monad 257 deriving ( Functor, Applicative, Monad
257 , MonadIO, MonadBase IO 258 , MonadIO, MonadBase IO
258 , MonadReader (Node ip) 259 , MonadReader (Node ip)
259 , MonadThrow, MonadUnsafeIO 260 , MonadThrow
260 ) 261 )
261 262
262instance MonadBaseControl IO (DHT ip) where 263instance MonadBaseControl IO (DHT ip) where
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index f208fa54..2d5f39bf 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -112,6 +112,7 @@ import Control.Concurrent hiding (yield)
112import Control.Exception 112import Control.Exception
113import Control.Monad.Reader 113import Control.Monad.Reader
114import Control.Monad.State 114import Control.Monad.State
115import Control.Monad.Trans.Resource
115import Control.Lens 116import Control.Lens
116import Data.ByteString as BS 117import Data.ByteString as BS
117import Data.ByteString.Lazy as BSL 118import Data.ByteString.Lazy as BSL