Merge pull request #676 from igraves/master

Switching to Data.Default.Class in yesod-bin.
2014-03-02 07:48:32 +02:00 · 2014-03-02 07:48:32 +02:00 · a1166022ed
commit a1166022ed
parent 12ddec8b8c 198e65d222
2 changed files with 2 additions and 2 deletions
--- a/yesod-bin/Devel.hs
+++ b/yesod-bin/Devel.hs
@ -69,7 +69,7 @@ import           Data.Conduit.Network                  (HostPreference (HostIPv4
 import           Network                               (withSocketsDo)
 #if MIN_VERSION_http_conduit(2, 0, 0)
 import           Network.HTTP.Conduit                  (conduitManagerSettings, newManager)
-import           Data.Default                          (def)
+import           Data.Default.Class                    (def)
 #else
 import           Network.HTTP.Conduit                  (def, newManager)
 #endif
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@ -89,7 +89,7 @@ executable             yesod
                     , transformers
                     , warp               >= 1.3.7.5
                     , wai                >= 1.4
-                     , data-default
+                     , data-default-class

    ghc-options:       -Wall -threaded
    main-is:           main.hs