From c24d0e7f80e0f7ee0b34a75add9d434b1fd8df5a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 22 Jun 2016 23:01:44 +0300 Subject: [PATCH] Allow deepseq 1.3 --- yesod-core/Yesod/Core/Types.hs | 4 +++- yesod-core/yesod-core.cabal | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs index 5ab13339..6ab28dfd 100644 --- a/yesod-core/Yesod/Core/Types.hs +++ b/yesod-core/Yesod/Core/Types.hs @@ -64,6 +64,7 @@ import Control.Monad.Reader (MonadReader (..)) import Prelude hiding (catch) #endif import Control.DeepSeq (NFData (rnf)) +import Control.DeepSeq.Generics (genericRnf) import Data.Conduit.Lazy (MonadActive, monadActive) import Yesod.Core.TypeCache (TypeMap, KeyedTypeMap) #if MIN_VERSION_monad_logger(0, 3, 10) @@ -317,7 +318,8 @@ data ErrorResponse = | PermissionDenied Text | BadMethod H.Method deriving (Show, Eq, Typeable, Generic) -instance NFData ErrorResponse +instance NFData ErrorResponse where + rnf = genericRnf ----- header stuff -- | Headers to be added to a 'Result'. diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 7f674576..ccafa5b9 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -63,7 +63,8 @@ library , unix-compat , conduit-extra , exceptions >= 0.6 - , deepseq >= 1.4 + , deepseq >= 1.3 + , deepseq-generics , mwc-random , primitive , word8