diff --git a/Yesod/Request.hs b/Yesod/Request.hs index 423488af..5dcddc80 100644 --- a/Yesod/Request.hs +++ b/Yesod/Request.hs @@ -49,6 +49,7 @@ import "transformers" Control.Monad.Trans #endif import Control.Monad (liftM) import Network.Wai.Parse +import Control.Monad.Instances () -- I'm missing the instance Monad ((->) r type ParamName = String type ParamValue = String @@ -59,9 +60,6 @@ class Monad m => RequestReader m where getRequest :: m Request instance RequestReader ((->) Request) where getRequest = id -instance Monad ((->) Request) where -- FIXME what's happening here? - return = const - f >>= g = \r -> g (f r) r -- | Get the list of supported languages supplied by the user. -- diff --git a/yesod.cabal b/yesod.cabal index 3ac49169..a7d64dd6 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -32,8 +32,8 @@ flag buildtests library build-depends: base >= 4 && < 5, time >= 1.1.3 && < 1.2, - wai >= 0.0.1 && < 0.3, - wai-extra >= 0.1.1 && < 0.2, + wai >= 0.1.0 && < 0.2, + wai-extra >= 0.1.2 && < 0.2, authenticate >= 0.6.2 && < 0.7, bytestring >= 0.9.1.4 && < 0.10, directory >= 1 && < 1.1,