Merge pull request #676 from igraves/master
Switching to Data.Default.Class in yesod-bin.
This commit is contained in:
commit
a1166022ed
@ -69,7 +69,7 @@ import Data.Conduit.Network (HostPreference (HostIPv4
|
|||||||
import Network (withSocketsDo)
|
import Network (withSocketsDo)
|
||||||
#if MIN_VERSION_http_conduit(2, 0, 0)
|
#if MIN_VERSION_http_conduit(2, 0, 0)
|
||||||
import Network.HTTP.Conduit (conduitManagerSettings, newManager)
|
import Network.HTTP.Conduit (conduitManagerSettings, newManager)
|
||||||
import Data.Default (def)
|
import Data.Default.Class (def)
|
||||||
#else
|
#else
|
||||||
import Network.HTTP.Conduit (def, newManager)
|
import Network.HTTP.Conduit (def, newManager)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -89,7 +89,7 @@ executable yesod
|
|||||||
, transformers
|
, transformers
|
||||||
, warp >= 1.3.7.5
|
, warp >= 1.3.7.5
|
||||||
, wai >= 1.4
|
, wai >= 1.4
|
||||||
, data-default
|
, data-default-class
|
||||||
|
|
||||||
ghc-options: -Wall -threaded
|
ghc-options: -Wall -threaded
|
||||||
main-is: main.hs
|
main-is: main.hs
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user