web: add Peter Simons' patch fixing Data.Conduit.Network HostIPv4 error (#171)
(cherry picked from commit 993cae3a74eaa42b720fe51744e5459fd5a4eaa9) Conflicts: hledger-web/Hledger/Web/Main.hs
This commit is contained in:
parent
01e5a2245d
commit
a9c83f0ce1
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user