From a9c83f0ce1c3f73cbb805d666844b2ab268d4098 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 17 Apr 2014 07:54:30 -0700
Subject: [PATCH] web: add Peter Simons' patch fixing Data.Conduit.Network
 HostIPv4 error (#171)

(cherry picked from commit 993cae3a74eaa42b720fe51744e5459fd5a4eaa9)

Conflicts:
	hledger-web/Hledger/Web/Main.hs
---
 hledger-web/Hledger/Web/Main.hs | 5 +++--
 hledger-web/hledger-web.cabal   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
index 56fa27d1b..3eba8f72c 100644
--- a/hledger-web/Hledger/Web/Main.hs
+++ b/hledger-web/Hledger/Web/Main.hs
@@ -15,7 +15,8 @@ import Yesod.Default.Config --(fromArgs)
 -- import Yesod.Default.Main   (defaultMain)
 import Settings            --  (parseExtra)
 import Application          (makeApplication)
-import Data.Conduit.Network (HostPreference(HostIPv4))
+import Data.String
+import Data.Conduit.Network
 import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
 import Network.Wai.Handler.Launch (runUrlPort)
 --
@@ -65,7 +66,7 @@ web opts j = do
   app <- makeApplication opts j' AppConfig{appEnv = Development
                                           ,appPort = p
                                           ,appRoot = pack u
-                                          ,appHost = HostIPv4
+                                          ,appHost = fromString "*4"
                                           ,appExtra = Extra "" Nothing staticRoot
                                           }
   if server_ opts
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 9e444323b..5c09052d9 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -129,6 +129,7 @@ library
                    , http-client          >= 0.2 && < 0.4
                    , HUnit
                    , network-conduit
+                   , conduit-extra
                    , old-locale
                    , parsec
                    , regexpr              >= 0.5.1
@@ -221,6 +222,7 @@ executable         hledger-web
                    , http-client          >= 0.2 && < 0.4
                    , HUnit
                    , network-conduit
+                   , conduit-extra
                    , old-locale
                    , parsec
                    , regexpr              >= 0.5.1