summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Presence/XMPPServer.hs5
-rw-r--r--stack.yaml6
2 files changed, 7 insertions, 4 deletions
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 8f32535a..8845ea72 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -248,9 +248,6 @@ wlog s = putStrLn s >> hFlush stdout
248wlogb :: ByteString -> IO () 248wlogb :: ByteString -> IO ()
249wlogb s = Strict8.putStrLn s >> hFlush stdout 249wlogb s = Strict8.putStrLn s >> hFlush stdout
250 250
251renderBuilderFlush :: Monad m => XML.RenderSettings -> Conduit (Flush Event) m (Flush Builder)
252renderBuilderFlush = undefined
253
254xmlStream :: ReadCommand -> WriteCommand -> ( Source IO XML.Event 251xmlStream :: ReadCommand -> WriteCommand -> ( Source IO XML.Event
255 , Sink (Flush XML.Event) IO () ) 252 , Sink (Flush XML.Event) IO () )
256xmlStream conread conwrite = (xsrc,xsnk) 253xmlStream conread conwrite = (xsrc,xsnk)
@@ -258,7 +255,7 @@ xmlStream conread conwrite = (xsrc,xsnk)
258 xsrc = src $= XML.parseBytes XML.def 255 xsrc = src $= XML.parseBytes XML.def
259 xsnk :: Sink (Flush Event) IO () 256 xsnk :: Sink (Flush Event) IO ()
260 xsnk = -- XML.renderBytes XML.def =$ snk 257 xsnk = -- XML.renderBytes XML.def =$ snk
261 renderBuilderFlush XML.def 258 XML.renderBuilderFlush XML.def
262 =$= builderToByteStringFlush 259 =$= builderToByteStringFlush
263 =$= discardFlush 260 =$= discardFlush
264 =$ snk 261 =$ snk
diff --git a/stack.yaml b/stack.yaml
index e2280624..75d3a726 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,6 +7,12 @@ resolver: lts-5.4
7# Local packages, usually specified by relative directory name 7# Local packages, usually specified by relative directory name
8packages: 8packages:
9- '.' 9- '.'
10- location:
11 git: git@github.com:afcady/xml.git
12 commit: 3096cfd59ea95944fab4b0af26e1722863f02090
13 subdirs:
14 - xml-conduit
15 extra-dep: true
10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) 16# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11extra-deps: [] 17extra-deps: []
12 18