diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-14 00:16:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-14 00:19:07 -0400 |
| commit | 68ddda02769785cca60b3b114ddc091b9670889a (patch) | |
| tree | 16605501a3b2182807974ba204783d789fab0b62 /standalone/no-th/haskell-patches/yesod_hack-TH.patch | |
| parent | cbf82dba2135acf4d36888421293a25dee636e1e (diff) | |
refresh android and no-th haskell patches to latest package versions from cabal
Added a cabal.config file; the result of running cabal freeze.
It's not used yet (needs a newer cabal than is in debian stable),
but the plan is that once the autbuilders are swiched to jessie,
this can be used to make cabal install the same versions of packages
that this patch got building, and so avoid breaking every time eg, yesod is
upgraded.
This commit was sponsored by Daniel Atlas.
Diffstat (limited to 'standalone/no-th/haskell-patches/yesod_hack-TH.patch')
| -rw-r--r-- | standalone/no-th/haskell-patches/yesod_hack-TH.patch | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/standalone/no-th/haskell-patches/yesod_hack-TH.patch b/standalone/no-th/haskell-patches/yesod_hack-TH.patch index 001d4a471..b1c5c44b4 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 da032b804c0a35c2831664e28c9211f4fe712593 Mon Sep 17 00:00:00 2001 +From 1d12efe6c85c57bce44d0cd9389c5538f36f599e Mon Sep 17 00:00:00 2001 From: dummy <dummy@example.com> -Date: Tue, 10 Jun 2014 20:39:42 +0000 -Subject: [PATCH] avoid TH +Date: Tue, 14 Oct 2014 03:40:28 +0000 +Subject: [PATCH] hack to build --- - Yesod.hs | 19 ++++++++++++-- - Yesod/Default/Main.hs | 32 +----------------------- - Yesod/Default/Util.hs | 69 ++------------------------------------------------- - 3 files changed, 20 insertions(+), 100 deletions(-) + Yesod.hs | 19 ++++++++++++-- + Yesod/Default/Main.hs | 27 +------------------ + Yesod/Default/Util.hs | 69 ++----------------------------------------------- + 3 files changed, 20 insertions(+), 95 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 565ed35..41c2df0 100644 +index 44e094e..41c2df0 100644 --- a/Yesod/Default/Main.hs +++ b/Yesod/Default/Main.hs @@ -1,10 +1,8 @@ @@ -64,7 +64,7 @@ index 565ed35..41c2df0 100644 import System.Log.FastLogger (LogStr, toLogStr) import Language.Haskell.TH.Syntax (qLocation) -@@ -55,34 +53,6 @@ defaultMain load getApp = do +@@ -55,29 +53,6 @@ defaultMain load getApp = do type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO () @@ -89,12 +89,7 @@ index 565ed35..41c2df0 100644 - (toLogStr $ "Exception from Warp: " ++ show e) - } app - where -- shouldLog' = --#if MIN_VERSION_warp(2,1,3) -- Warp.defaultShouldDisplayException --#else -- const True --#endif +- shouldLog' = Warp.defaultShouldDisplayException - -- | Run your application continously, listening for SIGINT and exiting -- when received @@ -196,5 +191,5 @@ index a10358e..0547424 100644 - else return $ Just ex - else return Nothing -- -2.0.0 +1.7.10.4 |