git.iko.soy/typeable/wai
on master help sign in
Fix build with current conduit
commitdff5fc6550df934be5b421ca8074ce97dfbc7166 authorMichael Snoyman <michael@snoyman.com> dateThu 27 Mar 2014, 16:54 (13 years ago) parent005ce4a
2 files changed+6−1
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Run.hs+5 warp/warp.cabal+1−1
warp/Network/Wai/Handler/Warp/Run.hs+5
@@ -15,7 +15,12 @@ import qualified Data.ByteString as S
1515import Data.Conduit
1616import Data.Conduit.Internal (ResumableSource (..))
1717import qualified Data.Conduit.List as CL
18+#if MIN_VERSION_conduit(1,1,0)
1819import Data.Streaming.Network (bindPortTCP)
20+#else
21+import Data.Conduit.Network (bindPort)
22+#define bindPortTCP bindPort
23+#endif
1924import Network (sClose, Socket)
2025import Network.Socket (accept, SockAddr)
2126import qualified Network.Socket.ByteString as Sock
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 2.1.3.1
2+Version: 2.1.3.2
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE