on master help sign in
Fix GHC-7.10 build
commitfd3d4e52ac0e34532f158681fc04e10d6b811ac6 authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 28 May 2019, 01:34 (7 years ago) parent52a4b4a
3 files changed+12−3
src/Streamly/Network/Socket.hs+10−1 stack-7.10.yaml+1−1 streamly.cabal+1−1
src/Streamly/Network/Socket.hs+10−1
@@ -75,9 +75,14 @@ import Foreign.Ptr (minusPtr, plusPtr, Ptr, castPtr)
7575import Foreign.Storable (Storable(..))
7676import GHC.ForeignPtr (mallocPlainForeignPtrBytes)
7777import Network.Socket
78− (withFdSocket, Socket, PortNumber, SocketOption(..), Family(..),
78+ (Socket, PortNumber, SocketOption(..), Family(..),
7979 SockAddr(..), withSocketsDo, SocketType(..), socket, accept, bind,
8080 defaultProtocol, setSocketOption, maxListenQueue, sendBuf, recvBuf)
81+#if MIN_VERSION_network(3,1,0)
82+import Network.Socket (withFdSocket)
83+#else
84+import Network.Socket (fdSocket)
85+#endif
8186import Prelude hiding (read)
8287
8388import qualified Network.Socket as Net
@@ -181,7 +186,11 @@ readArrayUpto = readArrayUptoWith recvBuf
181186
182187waitWhen0 :: Int -> Socket -> IO ()
183188waitWhen0 0 s = when rtsSupportsBoundThreads $
189+#if MIN_VERSION_network(3,1,0)
184190 withFdSocket s $ \fd -> threadWaitWrite $ fromIntegral fd
191+#else
192+ let fd = fdSocket s in threadWaitWrite $ fromIntegral fd
193+#endif
185194waitWhen0 _ _ = return ()
186195
187196sendAll :: Socket -> Ptr Word8 -> Int -> IO ()
stack-7.10.yaml+1−1
@@ -12,7 +12,7 @@ extra-deps:
1212 - basement-0.0.7
1313 - deepseq-1.4.4.0
1414 - typed-process-0.2.4.0@sha256:fb1574481a394bec4f49016fc42f2404cea4acf5b129329459dae5e416da560e
15− - network-3.1.0.0@sha256:85b36fea1dfe92af91b38224d6ea84eb0b17c03d9aed0260413be226722b0cd2
15+ - network-2.6.3.6@sha256:1ca79d81af02d7acd6032d5e6c9bde4618a8fdcfbe19bd42b49d420183975df0
1616
1717flags: {}
1818extra-package-dbs: []
streamly.cabal+1−1
@@ -266,7 +266,7 @@ library
266266 , mtl >= 2.2 && < 3
267267 , transformers >= 0.4 && < 0.6
268268 , transformers-base >= 0.4 && < 0.5
269− , network >= 3.1 && < 4
269+ , network >= 2.6 && < 4
270270
271271 if impl(ghc < 8.0)
272272 build-depends: