avoid forked xml-conduit

turns out it wasn't necessary

2 files changed, 13 insertions, 7 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 8845ea72..08e0b8c3 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -248,6 +248,18 @@ wlog s = putStrLn s >> hFlush stdout
 wlogb :: ByteString -> IO ()
 wlogb s = Strict8.putStrLn s >> hFlush stdout
 
+flushPassThrough :: Monad m => Conduit a m b -> Conduit (Flush a) m (Flush b)
+flushPassThrough c = getZipConduit $ ZipConduit (onlyChunks =$= mapOutput Chunk c) <* ZipConduit onlyFlushes
+  where
+    onlyChunks  :: Monad m => Conduit (Flush a) m a
+    onlyFlushes :: Monad m => Conduit (Flush a) m (Flush b)
+    onlyChunks           = awaitForever yieldChunk
+    onlyFlushes          = awaitForever yieldFlush
+    yieldFlush Flush     = yield Flush
+    yieldFlush _         = return ()
+    yieldChunk (Chunk x) = yield x
+    yieldChunk _         = return ()
+
 xmlStream :: ReadCommand -> WriteCommand -> ( Source IO XML.Event
                                             , Sink (Flush XML.Event) IO () )
 xmlStream conread conwrite = (xsrc,xsnk)
@@ -255,7 +267,7 @@ xmlStream conread conwrite = (xsrc,xsnk)
     xsrc = src $= XML.parseBytes XML.def
     xsnk :: Sink (Flush Event) IO ()
     xsnk = -- XML.renderBytes XML.def =$ snk
-        XML.renderBuilderFlush XML.def
+        flushPassThrough (XML.renderBuilder XML.def)
         =$= builderToByteStringFlush
         =$= discardFlush
         =$ snk
diff --git a/stack.yaml b/stack.yaml
index 75d3a726..e2280624 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,12 +7,6 @@ resolver: lts-5.4
 # Local packages, usually specified by relative directory name
 packages:
 - '.'
-- location:
-    git: git@github.com:afcady/xml.git
-    commit: 3096cfd59ea95944fab4b0af26e1722863f02090
-  subdirs:
-  - xml-conduit
-  extra-dep: true
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps: []