summaryrefslogtreecommitdiff
path: root/standalone/no-th
diff options
context:
space:
mode:
Diffstat (limited to 'standalone/no-th')
-rw-r--r--standalone/no-th/haskell-patches/file-embed_remove-TH.patch43
-rw-r--r--standalone/no-th/haskell-patches/lens_no-TH.patch64
-rw-r--r--standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch24
-rw-r--r--standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch22
-rw-r--r--standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch19
-rw-r--r--standalone/no-th/haskell-patches/yesod-core_expand_TH.patch28
-rw-r--r--standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch10
-rw-r--r--standalone/no-th/haskell-patches/yesod_hack-TH.patch19
8 files changed, 126 insertions, 103 deletions
diff --git a/standalone/no-th/haskell-patches/file-embed_remove-TH.patch b/standalone/no-th/haskell-patches/file-embed_remove-TH.patch
index e637465e1..a089f1f9e 100644
--- a/standalone/no-th/haskell-patches/file-embed_remove-TH.patch
+++ b/standalone/no-th/haskell-patches/file-embed_remove-TH.patch
@@ -1,17 +1,17 @@
-From cd49a96991dc3dd8867038fa9d426a8ccdb25f8d Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 17 Dec 2013 18:40:48 +0000
+From 2b41af230ea5675592e87a2362d9c17bcd8df1db Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Tue, 10 Jun 2014 19:00:44 +0000
Subject: [PATCH] remove TH
---
- Data/FileEmbed.hs | 87 ++++---------------------------------------------------
- 1 file changed, 5 insertions(+), 82 deletions(-)
+ Data/FileEmbed.hs | 100 +++---------------------------------------------------
+ 1 file changed, 5 insertions(+), 95 deletions(-)
diff --git a/Data/FileEmbed.hs b/Data/FileEmbed.hs
-index 5617493..ad92cdc 100644
+index aae9d5a..efdbb7b 100644
--- a/Data/FileEmbed.hs
+++ b/Data/FileEmbed.hs
-@@ -17,13 +17,13 @@
+@@ -17,19 +17,18 @@
-- > {-# LANGUAGE TemplateHaskell #-}
module Data.FileEmbed
( -- * Embed at compile time
@@ -30,7 +30,13 @@ index 5617493..ad92cdc 100644
#endif
, inject
, injectFile
-@@ -56,72 +56,11 @@ import Data.ByteString.Unsafe (unsafePackAddressLen)
+ -- * Internal
+ , stringToBs
+- , bsToExp
+ ) where
+
+ import Language.Haskell.TH.Syntax
+@@ -57,85 +56,12 @@ import Data.ByteString.Unsafe (unsafePackAddressLen)
import System.IO.Unsafe (unsafePerformIO)
import System.FilePath ((</>))
@@ -81,7 +87,7 @@ index 5617493..ad92cdc 100644
- e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp))
- return $ SigE e typ
-
---- | Get a directory tree in the IO monad.
+ -- | Get a directory tree in the IO monad.
--
-- This is the workhorse of 'embedDir'
getDir :: FilePath -> IO [(FilePath, B.ByteString)]
@@ -96,14 +102,27 @@ index 5617493..ad92cdc 100644
- return $! TupE [LitE $ StringL path, exp']
-
-bsToExp :: B.ByteString -> Q Exp
+-#if MIN_VERSION_template_haskell(2, 5, 0)
+-bsToExp bs =
+- return $ VarE 'unsafePerformIO
+- `AppE` (VarE 'unsafePackAddressLen
+- `AppE` LitE (IntegerL $ fromIntegral $ B8.length bs)
+-#if MIN_VERSION_template_haskell(2, 8, 0)
+- `AppE` LitE (StringPrimL $ B.unpack bs))
+-#else
+- `AppE` LitE (StringPrimL $ B8.unpack bs))
+-#endif
+-#else
-bsToExp bs = do
- helper <- [| stringToBs |]
- let chars = B8.unpack bs
- return $! AppE helper $! LitE $! StringL chars
-
+-#endif
+-
stringToBs :: String -> B.ByteString
stringToBs = B8.pack
-@@ -164,22 +103,6 @@ padSize i =
+
+@@ -177,22 +103,6 @@ padSize i =
let s = show i
in replicate (sizeLen - length s) '0' ++ s
@@ -127,5 +146,5 @@ index 5617493..ad92cdc 100644
inject :: B.ByteString -- ^ bs to inject
-> B.ByteString -- ^ original BS containing dummy
--
-1.8.5.1
+2.0.0
diff --git a/standalone/no-th/haskell-patches/lens_no-TH.patch b/standalone/no-th/haskell-patches/lens_no-TH.patch
index ec0cf00dc..7fdd70639 100644
--- a/standalone/no-th/haskell-patches/lens_no-TH.patch
+++ b/standalone/no-th/haskell-patches/lens_no-TH.patch
@@ -1,21 +1,20 @@
-From 2109923a879a02c8a79e8e08573bf9e500d8afc8 Mon Sep 17 00:00:00 2001
+From bc312c7431877b3b788de5e7ce5ee743be73c0ba Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Wed, 21 May 2014 16:25:06 +0000
-Subject: [PATCH] remove TH
+Date: Tue, 10 Jun 2014 22:13:58 +0000
+Subject: [PATCH] remove TH
---
- lens.cabal | 20 +-------------------
- src/Control/Lens.hs | 8 ++------
- src/Control/Lens/Cons.hs | 2 --
- src/Control/Lens/Internal/Fold.hs | 2 --
- src/Control/Lens/Internal/Reflection.hs | 2 --
- src/Control/Lens/Operators.hs | 2 +-
- src/Control/Lens/Prism.hs | 2 --
- src/Control/Monad/Primitive/Lens.hs | 1 -
- 8 files changed, 4 insertions(+), 35 deletions(-)
+ lens.cabal | 19 +------------------
+ src/Control/Lens.hs | 8 ++------
+ src/Control/Lens/Cons.hs | 2 --
+ src/Control/Lens/Internal/Fold.hs | 2 --
+ src/Control/Lens/Operators.hs | 2 +-
+ src/Control/Lens/Prism.hs | 2 --
+ src/Control/Monad/Primitive/Lens.hs | 1 -
+ 7 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/lens.cabal b/lens.cabal
-index 03f64f5..3f6f6d2 100644
+index d70c2f4..28af768 100644
--- a/lens.cabal
+++ b/lens.cabal
@@ -10,7 +10,7 @@ stability: provisional
@@ -25,17 +24,9 @@ index 03f64f5..3f6f6d2 100644
-build-type: Custom
+build-type: Simple
-- build-tools: cpphs
- tested-with: GHC == 7.6.3
+ tested-with: GHC == 7.4.1, GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.1, GHC == 7.8.2
synopsis: Lenses, Folds and Traversals
-@@ -182,7 +182,6 @@ flag j
-
- library
- build-depends:
-- aeson >= 0.7 && < 0.8,
- array >= 0.3.0.2 && < 0.6,
- base >= 4.3 && < 5,
- bifunctors >= 4 && < 5,
-@@ -221,7 +220,6 @@ library
+@@ -220,7 +220,6 @@ library
Control.Exception.Lens
Control.Lens
Control.Lens.Action
@@ -43,7 +34,7 @@ index 03f64f5..3f6f6d2 100644
Control.Lens.Combinators
Control.Lens.Cons
Control.Lens.Each
-@@ -249,29 +247,24 @@ library
+@@ -248,29 +247,24 @@ library
Control.Lens.Internal.Reflection
Control.Lens.Internal.Review
Control.Lens.Internal.Setter
@@ -73,7 +64,7 @@ index 03f64f5..3f6f6d2 100644
Data.Array.Lens
Data.Bits.Lens
Data.ByteString.Lens
-@@ -294,17 +287,10 @@ library
+@@ -293,17 +287,10 @@ library
Data.Typeable.Lens
Data.Vector.Lens
Data.Vector.Generic.Lens
@@ -91,7 +82,7 @@ index 03f64f5..3f6f6d2 100644
cpp-options: -traditional
if flag(safe)
-@@ -406,7 +392,6 @@ test-suite doctests
+@@ -405,7 +392,6 @@ test-suite doctests
deepseq,
doctest >= 0.9.1,
filepath,
@@ -99,7 +90,7 @@ index 03f64f5..3f6f6d2 100644
mtl,
nats,
parallel,
-@@ -444,7 +429,6 @@ benchmark plated
+@@ -443,7 +429,6 @@ benchmark plated
comonad,
criterion,
deepseq,
@@ -107,7 +98,7 @@ index 03f64f5..3f6f6d2 100644
lens,
transformers
-@@ -479,7 +463,6 @@ benchmark unsafe
+@@ -478,7 +463,6 @@ benchmark unsafe
comonads-fd,
criterion,
deepseq,
@@ -115,7 +106,7 @@ index 03f64f5..3f6f6d2 100644
lens,
transformers
-@@ -496,6 +479,5 @@ benchmark zipper
+@@ -495,6 +479,5 @@ benchmark zipper
comonads-fd,
criterion,
deepseq,
@@ -196,19 +187,6 @@ index ab09c6b..43aa905 100644
------------------------------------------------------------------------------
-- Folding
------------------------------------------------------------------------------
-diff --git a/src/Control/Lens/Internal/Reflection.hs b/src/Control/Lens/Internal/Reflection.hs
-index bf09f2c..c9e112f 100644
---- a/src/Control/Lens/Internal/Reflection.hs
-+++ b/src/Control/Lens/Internal/Reflection.hs
-@@ -64,8 +64,6 @@ import Data.Word
- import Data.Typeable
- import Data.Reflection
-
--{-# ANN module "HLint: ignore Avoid lambda" #-}
--
- class Typeable s => B s where
- reflectByte :: proxy s -> IntPtr
-
diff --git a/src/Control/Lens/Operators.hs b/src/Control/Lens/Operators.hs
index 9992e63..631e8e6 100644
--- a/src/Control/Lens/Operators.hs
@@ -248,5 +226,5 @@ index ee942c6..2f37134 100644
prim :: (PrimMonad m) => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
prim = iso internal primitive
--
-2.0.0.rc2
+2.0.0
diff --git a/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch b/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch
new file mode 100644
index 000000000..4d39e91cf
--- /dev/null
+++ b/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch
@@ -0,0 +1,24 @@
+From b0a79f4f98188ba5d43b7e3912b36d34d099ab65 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Fri, 18 Oct 2013 23:20:35 +0000
+Subject: [PATCH] cross build
+
+---
+ Data/Vector/Fusion/Stream/Monadic.hs | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Data/Vector/Fusion/Stream/Monadic.hs b/Data/Vector/Fusion/Stream/Monadic.hs
+index 51fec75..b089b3d 100644
+--- a/Data/Vector/Fusion/Stream/Monadic.hs
++++ b/Data/Vector/Fusion/Stream/Monadic.hs
+@@ -101,7 +101,6 @@ import GHC.Exts ( SpecConstrAnnotation(..) )
+
+ data SPEC = SPEC | SPEC2
+ #if __GLASGOW_HASKELL__ >= 700
+-{-# ANN type SPEC ForceSpecConstr #-}
+ #endif
+
+ emptyStream :: String
+--
+1.7.10.4
+
diff --git a/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch b/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
index 666e86eec..93314312f 100644
--- a/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
+++ b/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
@@ -1,6 +1,6 @@
-From 685d4d9fbb929ed1356f8346f573e187746aee4b Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Thu, 22 May 2014 16:29:20 -0400
+From 3aef808eee43c973ae1fbf6e8769d89b7f0d355b Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Tue, 10 Jun 2014 14:47:42 +0000
Subject: [PATCH] deal with TH
Export modules referenced by it.
@@ -14,7 +14,7 @@ Splicer.
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Network/Wai/Application/Static.hs b/Network/Wai/Application/Static.hs
-index f2fa743..1a82b30 100644
+index db2b835..b2c1aec 100644
--- a/Network/Wai/Application/Static.hs
+++ b/Network/Wai/Application/Static.hs
@@ -33,8 +33,6 @@ import Control.Monad.IO.Class (liftIO)
@@ -26,13 +26,13 @@ index f2fa743..1a82b30 100644
import Data.Text (Text)
import qualified Data.Text as T
-@@ -198,8 +196,6 @@ staticAppPieces _ _ req
+@@ -198,8 +196,6 @@ staticAppPieces _ _ req sendResponse
H.status405
[("Content-Type", "text/plain")]
"Only GET is supported"
--staticAppPieces _ [".hidden", "folder.png"] _ = return $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/folder.png")]
--staticAppPieces _ [".hidden", "haskell.png"] _ = return $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/haskell.png")]
- staticAppPieces ss rawPieces req = liftIO $ do
+-staticAppPieces _ [".hidden", "folder.png"] _ sendResponse = sendResponse $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/folder.png")]
+-staticAppPieces _ [".hidden", "haskell.png"] _ sendResponse = sendResponse $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/haskell.png")]
+ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
case toPieces rawPieces of
Just pieces -> checkPieces ss pieces req >>= response
diff --git a/WaiAppStatic/Storage/Embedded.hs b/WaiAppStatic/Storage/Embedded.hs
@@ -55,7 +55,7 @@ index daa6e50..9873d4e 100644
-import WaiAppStatic.Storage.Embedded.TH
+--import WaiAppStatic.Storage.Embedded.TH
diff --git a/wai-app-static.cabal b/wai-app-static.cabal
-index 925d350..e5d11a6 100644
+index ef6f898..9a59d71 100644
--- a/wai-app-static.cabal
+++ b/wai-app-static.cabal
@@ -33,7 +33,6 @@ library
@@ -66,7 +66,7 @@ index 925d350..e5d11a6 100644
, text >= 0.7
, blaze-builder >= 0.2.1.4
, base64-bytestring >= 0.1
-@@ -60,9 +59,8 @@ library
+@@ -61,9 +60,8 @@ library
WaiAppStatic.Listing
WaiAppStatic.Types
WaiAppStatic.CmdLine
@@ -78,5 +78,5 @@ index 925d350..e5d11a6 100644
extensions: CPP
--
-2.0.0.rc2
+2.0.0
diff --git a/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch b/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
index f70818966..3e0d0d9ba 100644
--- a/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
+++ b/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
@@ -1,19 +1,19 @@
-From 9a8637661270d3c6a15e6aeca5e8983fe126bd27 Mon Sep 17 00:00:00 2001
+From 583575461dc58b76c6c7e14d429f73182d49ef81 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Wed, 21 May 2014 05:27:36 +0000
+Date: Tue, 10 Jun 2014 20:29:51 +0000
Subject: [PATCH] don't really build
---
- yesod-auth.cabal | 10 ----------
- 1 file changed, 10 deletions(-)
+ yesod-auth.cabal | 11 -----------
+ 1 file changed, 11 deletions(-)
diff --git a/yesod-auth.cabal b/yesod-auth.cabal
-index 0872581..723cde0 100644
+index 906c08b..b4bc841 100644
--- a/yesod-auth.cabal
+++ b/yesod-auth.cabal
-@@ -60,16 +60,6 @@ library
- , byteable
- , binary
+@@ -65,17 +65,6 @@ library
+ , conduit-extra
+ , attoparsec-conduit
- exposed-modules: Yesod.Auth
- Yesod.Auth.BrowserId
@@ -23,11 +23,12 @@ index 0872581..723cde0 100644
- Yesod.Auth.Rpxnow
- Yesod.Auth.Message
- Yesod.Auth.GoogleEmail
+- Yesod.Auth.GoogleEmail2
- other-modules: Yesod.Auth.Routes
- Yesod.PasswordStore
ghc-options: -Wall
source-repository head
--
-2.0.0.rc2
+2.0.0
diff --git a/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch b/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
index 77d999732..07663ac80 100644
--- a/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
+++ b/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
@@ -1,6 +1,6 @@
-From ccea70b3cb02c3a9e7fa43ebfbfcfdda76f9307f Mon Sep 17 00:00:00 2001
+From 9feb37d13dc8449dc4445db83485780caee4b7ff Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Wed, 21 May 2014 03:51:16 +0000
+Date: Tue, 10 Jun 2014 17:44:52 +0000
Subject: [PATCH] expand and remove TH
---
@@ -408,7 +408,7 @@ index 140600b..75daabc 100644
- char = show . snd . loc_start
+fileLocationToString loc = "unknown"
diff --git a/Yesod/Core/Dispatch.hs b/Yesod/Core/Dispatch.hs
-index 59663a8..9408a95 100644
+index e0d1f0e..cc23fdd 100644
--- a/Yesod/Core/Dispatch.hs
+++ b/Yesod/Core/Dispatch.hs
@@ -1,4 +1,3 @@
@@ -445,7 +445,7 @@ index 59663a8..9408a95 100644
, PathMultiPiece (..)
, Texts
-- * Convert to WAI
-@@ -130,13 +129,6 @@ toWaiAppLogger logger site = do
+@@ -135,13 +134,6 @@ toWaiAppLogger logger site = do
, yreSite = site
, yreSessionBackend = sb
}
@@ -459,7 +459,7 @@ index 59663a8..9408a95 100644
middleware <- mkDefaultMiddlewares logger
return $ middleware $ toWaiAppYre yre
-@@ -165,14 +157,7 @@ warp port site = do
+@@ -170,14 +162,7 @@ warp port site = do
]
-}
, Network.Wai.Handler.Warp.settingsOnException = const $ \e ->
@@ -475,7 +475,7 @@ index 59663a8..9408a95 100644
}
where
shouldLog' =
-@@ -206,7 +191,6 @@ defaultMiddlewaresNoLogging = acceptOverride . autohead . gzip def . methodOverr
+@@ -211,7 +196,6 @@ defaultMiddlewaresNoLogging = acceptOverride . autohead . gzip def . methodOverr
-- | Deprecated synonym for 'warp'.
warpDebug :: YesodDispatch site => Int -> site -> IO ()
warpDebug = warp
@@ -484,10 +484,10 @@ index 59663a8..9408a95 100644
-- | Runs your application using default middlewares (i.e., via 'toWaiApp'). It
-- reads port information from the PORT environment variable, as used by tools
diff --git a/Yesod/Core/Handler.hs b/Yesod/Core/Handler.hs
-index e5cbc44..db7c097 100644
+index 2e5d7cb..83f93bf 100644
--- a/Yesod/Core/Handler.hs
+++ b/Yesod/Core/Handler.hs
-@@ -169,7 +169,7 @@ import Data.Text.Encoding (decodeUtf8With, encodeUtf8)
+@@ -172,7 +172,7 @@ import Data.Text.Encoding (decodeUtf8With, encodeUtf8)
import Data.Text.Encoding.Error (lenientDecode)
import qualified Data.Text.Lazy as TL
import qualified Text.Blaze.Html.Renderer.Text as RenderText
@@ -496,15 +496,15 @@ index e5cbc44..db7c097 100644
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
-@@ -198,6 +198,7 @@ import Control.Exception (throwIO)
+@@ -201,6 +201,7 @@ import Control.Exception (throwIO)
import Blaze.ByteString.Builder (Builder)
import Safe (headMay)
import Data.CaseInsensitive (CI)
+import qualified Text.Blaze.Internal
+ import qualified Data.Conduit.List as CL
+ import Control.Monad (unless)
import Control.Monad.Trans.Resource (MonadResource, InternalState, runResourceT, withInternalState, getInternalState, liftResourceT, resourceForkIO
- #if MIN_VERSION_wai(2, 0, 0)
- #else
-@@ -806,19 +807,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
+@@ -847,19 +848,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
-> m a
redirectToPost url = do
urlText <- toTextUrl url
@@ -534,7 +534,7 @@ index e5cbc44..db7c097 100644
-- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'.
hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html
diff --git a/Yesod/Core/Internal/Run.hs b/Yesod/Core/Internal/Run.hs
-index 3e2e4e0..b92eadb 100644
+index 09b4609..e1ef568 100644
--- a/Yesod/Core/Internal/Run.hs
+++ b/Yesod/Core/Internal/Run.hs
@@ -16,8 +16,8 @@ import Control.Exception.Lifted (catch)
@@ -767,5 +767,5 @@ index 481199e..8489fbe 100644
ihamletToRepHtml :: (MonadHandler m, RenderMessage (HandlerSite m) message)
=> HtmlUrlI18n message (Route (HandlerSite m))
--
-2.0.0.rc2
+2.0.0
diff --git a/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch b/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
index 435fa7cd6..a2210d4c4 100644
--- a/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
+++ b/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
@@ -1,6 +1,6 @@
-From b232effd092b03c6ad4235e5aa0c5750461af02d Mon Sep 17 00:00:00 2001
+From 92a34bc2b09572a58a4e696e0d8a0a61475535f7 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Wed, 21 May 2014 04:47:44 +0000
+Date: Tue, 10 Jun 2014 19:09:56 +0000
Subject: [PATCH] do not really build
---
@@ -8,7 +8,7 @@ Subject: [PATCH] do not really build
1 file changed, 10 deletions(-)
diff --git a/yesod-persistent.cabal b/yesod-persistent.cabal
-index 3560dd9..d01be4a 100644
+index b44499b..ef33863 100644
--- a/yesod-persistent.cabal
+++ b/yesod-persistent.cabal
@@ -14,16 +14,6 @@ description: Some helpers for using Persistent from Yesod.
@@ -18,7 +18,7 @@ index 3560dd9..d01be4a 100644
- , yesod-core >= 1.2.2 && < 1.3
- , persistent >= 1.2 && < 1.4
- , persistent-template >= 1.2 && < 1.4
-- , transformers >= 0.2.2 && < 0.4
+- , transformers >= 0.2.2
- , blaze-builder
- , conduit
- , resourcet >= 0.4.5
@@ -29,5 +29,5 @@ index 3560dd9..d01be4a 100644
test-suite test
--
-2.0.0.rc2
+2.0.0
diff --git a/standalone/no-th/haskell-patches/yesod_hack-TH.patch b/standalone/no-th/haskell-patches/yesod_hack-TH.patch
index 5a7fbfc7d..001d4a471 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 86264ab2a76568585cacca9145e440d6c06edbe3 Mon Sep 17 00:00:00 2001
+From da032b804c0a35c2831664e28c9211f4fe712593 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Wed, 21 May 2014 06:30:03 +0000
+Date: Tue, 10 Jun 2014 20:39:42 +0000
Subject: [PATCH] avoid TH
---
Yesod.hs | 19 ++++++++++++--
- Yesod/Default/Main.hs | 31 +----------------------
+ Yesod/Default/Main.hs | 32 +-----------------------
Yesod/Default/Util.hs | 69 ++-------------------------------------------------
- 3 files changed, 20 insertions(+), 99 deletions(-)
+ 3 files changed, 20 insertions(+), 100 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 e273de2..bf46642 100644
+index 565ed35..41c2df0 100644
--- a/Yesod/Default/Main.hs
+++ b/Yesod/Default/Main.hs
@@ -1,10 +1,8 @@
@@ -64,7 +64,7 @@ index e273de2..bf46642 100644
import System.Log.FastLogger (LogStr, toLogStr)
import Language.Haskell.TH.Syntax (qLocation)
-@@ -55,33 +53,6 @@ defaultMain load getApp = do
+@@ -55,34 +53,6 @@ defaultMain load getApp = do
type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO ()
@@ -90,14 +90,15 @@ index e273de2..bf46642 100644
- } app
- where
- shouldLog' =
--#if MIN_VERSION_wai(2,1,3)
+-#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
@@ -195,5 +196,5 @@ index a10358e..0547424 100644
- else return $ Just ex
- else return Nothing
--
-2.0.0.rc2
+2.0.0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 18:07:59 +0000