7a232eb · streamly · git.iko.soy

src/Streamly/Network/Socket.hs+7−4

compare with master

unifiedsplit

@@ -74,8 +74,15 @@ import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

74import Foreign.Ptr (minusPtr, plusPtr, Ptr, castPtr)

75import Foreign.Storable (Storable(..))

76import GHC.ForeignPtr (mallocPlainForeignPtrBytes)

77+import Network.Socket

78+ (withFdSocket, Socket, PortNumber, SocketOption(..), Family(..),

79+ SockAddr(..), withSocketsDo, SocketType(..), socket, accept, bind,

80+ defaultProtocol, setSocketOption, maxListenQueue, sendBuf, recvBuf)

77import Prelude hiding (read)

81import Prelude hiding (read)

78

82

83+import qualified Network.Socket as Net

84+

85+import Streamly (MonadAsync)

79import Streamly.Mem.Array.Types (Array(..))

86import Streamly.Mem.Array.Types (Array(..))

80import Streamly.Streams.Serial (SerialT)

87import Streamly.Streams.Serial (SerialT)

81import Streamly.Streams.StreamK.Type (IsStream, mkStream)

88import Streamly.Streams.StreamK.Type (IsStream, mkStream)

@@ -86,10 +93,6 @@ import qualified Streamly.Mem.Array as A

86import qualified Streamly.Mem.Array.Types as A hiding (flattenArrays)

93import qualified Streamly.Mem.Array.Types as A hiding (flattenArrays)

87import qualified Streamly.Prelude as S

94import qualified Streamly.Prelude as S

88

95

89−import Network.Socket hiding (listen)

90−import qualified Network.Socket as Net

91−import Streamly (MonadAsync)

92−

93-------------------------------------------------------------------------------

96-------------------------------------------------------------------------------

94-- Listen

97-- Listen

95-------------------------------------------------------------------------------

98-------------------------------------------------------------------------------

stack.yaml+2−1

@@ -8,8 +8,9 @@ extra-deps:

8 - bench-show-0.2.2

9

10 - diagrams-postscript-1.4.1@sha256:a39c44f8a93929de88e5c363290d5bb8bc93ba15cd36af5c9ca5b620d51cdf68

11+ - network-3.1.0.0@sha256:85b36fea1dfe92af91b38224d6ea84eb0b17c03d9aed0260413be226722b0cd2

11

12

12−allow-newer: true

13+#allow-newer: true

13flags: {}

14flags: {}

14extra-package-dbs: []

15extra-package-dbs: []

15rebuild-ghc-options: true

16rebuild-ghc-options: true

streamly.cabal+1−1

@@ -266,7 +266,7 @@ library

266 , mtl >= 2.2 && < 3

267 , transformers >= 0.4 && < 0.6

268 , transformers-base >= 0.4 && < 0.5

269− , network >= 3.0 && < 4

269+ , network >= 3.1 && < 4

270

271 if impl(ghc < 8.0)

272 build-depends: