diff options
Diffstat (limited to 'standalone/no-th/haskell-patches/yesod_hack-TH.patch')
| -rw-r--r-- | standalone/no-th/haskell-patches/yesod_hack-TH.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/standalone/no-th/haskell-patches/yesod_hack-TH.patch b/standalone/no-th/haskell-patches/yesod_hack-TH.patch index b1c5c44b4..ebf8a786b 100644 --- a/standalone/no-th/haskell-patches/yesod_hack-TH.patch +++ b/standalone/no-th/haskell-patches/yesod_hack-TH.patch @@ -1,13 +1,13 @@ -From 1d12efe6c85c57bce44d0cd9389c5538f36f599e Mon Sep 17 00:00:00 2001 +From 59091cd37958fee79b9e346fe3118d5ed7d0104b Mon Sep 17 00:00:00 2001 From: dummy <dummy@example.com> -Date: Tue, 14 Oct 2014 03:40:28 +0000 -Subject: [PATCH] hack to build +Date: Thu, 16 Oct 2014 02:36:37 +0000 +Subject: [PATCH] hack TH --- - Yesod.hs | 19 ++++++++++++-- - Yesod/Default/Main.hs | 27 +------------------ - Yesod/Default/Util.hs | 69 ++----------------------------------------------- - 3 files changed, 20 insertions(+), 95 deletions(-) + Yesod.hs | 19 ++++++++++++-- + Yesod/Default/Main.hs | 31 +---------------------- + Yesod/Default/Util.hs | 69 ++------------------------------------------------- + 3 files changed, 20 insertions(+), 99 deletions(-) diff --git a/Yesod.hs b/Yesod.hs index b367144..fbe309c 100644 @@ -41,7 +41,7 @@ index b367144..fbe309c 100644 +insert = undefined + diff --git a/Yesod/Default/Main.hs b/Yesod/Default/Main.hs -index 44e094e..41c2df0 100644 +index 565ed35..bf46642 100644 --- a/Yesod/Default/Main.hs +++ b/Yesod/Default/Main.hs @@ -1,10 +1,8 @@ @@ -64,7 +64,7 @@ index 44e094e..41c2df0 100644 import System.Log.FastLogger (LogStr, toLogStr) import Language.Haskell.TH.Syntax (qLocation) -@@ -55,29 +53,6 @@ defaultMain load getApp = do +@@ -55,33 +53,6 @@ defaultMain load getApp = do type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO () @@ -89,11 +89,15 @@ index 44e094e..41c2df0 100644 - (toLogStr $ "Exception from Warp: " ++ show e) - } app - where -- shouldLog' = Warp.defaultShouldDisplayException -- +- shouldLog' = +-#if MIN_VERSION_warp(2,1,3) +- Warp.defaultShouldDisplayException +-#else +- const True +-#endif + -- | Run your application continously, listening for SIGINT and exiting -- when received - -- diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs index a10358e..0547424 100644 --- a/Yesod/Default/Util.hs @@ -191,5 +195,5 @@ index a10358e..0547424 100644 - else return $ Just ex - else return Nothing -- -1.7.10.4 +2.1.1 |