haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HostPreference conflict #769

Browse Source
This commit is contained in:
Michael Snoyman 2014-07-10 08:46:16 +03:00
parent 0032973099
commit 9dd2cfd63e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod/Yesod/Default/Config.hs
View File

@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe)
import qualified Data.HashMap.Strict as M import qualified Data.HashMap.Strict as M
import System.Environment (getArgs, getProgName, getEnvironment) import System.Environment (getArgs, getProgName, getEnvironment)
import System.Exit (exitFailure) import System.Exit (exitFailure)
import Data.Conduit.Network (HostPreference) import Data.Streaming.Network (HostPreference)
import Data.String (fromString) import Data.String (fromString)
-- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and -- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and

3
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 1.2.6 version: 1.2.6.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -50,6 +50,7 @@ library
, fast-logger , fast-logger
, conduit-extra , conduit-extra
, shakespeare , shakespeare
, streaming-commons
exposed-modules: Yesod exposed-modules: Yesod
, Yesod.Default.Config , Yesod.Default.Config