mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refresh patches

Browse source
This commit is contained in:
Joey Hess 2014-02-08 17:24:31 +00:00
parent c735c4ea38
commit e3a50f4abb
10 changed files with 323 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

50
standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
View file

@ -1,50 +0,0 @@
From afdec6c9e66211a0ac8419fffe191b059d1fd00c Mon Sep 17 00:00:00 2001
From: foo <foo@bar>
Date: Sun, 22 Sep 2013 17:24:33 +0000
Subject: [PATCH] fix build with new base
---
Data/Text/IDN/IDNA.chs | 1 +
Data/Text/IDN/Punycode.chs | 1 +
Data/Text/IDN/StringPrep.chs | 1 +
3 files changed, 3 insertions(+)
diff --git a/Data/Text/IDN/IDNA.chs b/Data/Text/IDN/IDNA.chs
index ed29ee4..dbb4ba5 100644
--- a/Data/Text/IDN/IDNA.chs
+++ b/Data/Text/IDN/IDNA.chs
@@ -31,6 +31,7 @@ import Foreign
import Foreign.C
import Data.Text.IDN.Internal
+import System.IO.Unsafe
#include <idna.h>
#include <idn-free.h>
diff --git a/Data/Text/IDN/Punycode.chs b/Data/Text/IDN/Punycode.chs
index 24b5fa6..4e62555 100644
--- a/Data/Text/IDN/Punycode.chs
+++ b/Data/Text/IDN/Punycode.chs
@@ -32,6 +32,7 @@ import Data.List (unfoldr)
import qualified Data.ByteString as B
import qualified Data.Text as T
+import System.IO.Unsafe
import Foreign
import Foreign.C
diff --git a/Data/Text/IDN/StringPrep.chs b/Data/Text/IDN/StringPrep.chs
index 752dc9e..5e9fd84 100644
--- a/Data/Text/IDN/StringPrep.chs
+++ b/Data/Text/IDN/StringPrep.chs
@@ -39,6 +39,7 @@ import qualified Data.ByteString as B
import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
+import System.IO.Unsafe
import Foreign
import Foreign.C
--
1.7.10.4

25
standalone/android/haskell-patches/libxml-sax_text-dep.patch Normal file
View file

@ -0,0 +1,25 @@
From d4c861dbdee34cb2434085b9ece62c416d4cad79 Mon Sep 17 00:00:00 2001
From: androidbuilder <androidbuilder@example.com>
Date: Sat, 8 Feb 2014 17:19:37 +0000
Subject: [PATCH] text dependency
---
libxml-sax.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libxml-sax.cabal b/libxml-sax.cabal
index 60dba81..d6883bd 100644
--- a/libxml-sax.cabal
+++ b/libxml-sax.cabal
@@ -35,7 +35,7 @@ library
build-depends:
base >= 4.1 && < 5.0
, bytestring >= 0.9
- , text >= 0.7 && < 0.12
+ , text
, xml-types >= 0.3 && < 0.4
exposed-modules:
--
1.7.10.4

25
standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch Normal file
View file

@ -0,0 +1,25 @@
From 8f124aad6d04abba5729af21ba3b50944f165d4b Mon Sep 17 00:00:00 2001
From: androidbuilder <androidbuilder@example.com>
Date: Sat, 8 Feb 2014 17:20:41 +0000
Subject: [PATCH] text dependency
---
network-protocol-xmpp.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/network-protocol-xmpp.cabal b/network-protocol-xmpp.cabal
index 2500075..d709a15 100644
--- a/network-protocol-xmpp.cabal
+++ b/network-protocol-xmpp.cabal
@@ -36,7 +36,7 @@ library
, libxml-sax >= 0.7 && < 0.8
, monads-tf >= 0.1 && < 0.2
, network >= 2.2
- , text >= 0.10 && < 0.12
+ , text
, transformers >= 0.2
, xml-types >= 0.3 && < 0.4
--
1.7.10.4

25
standalone/android/haskell-patches/system-filepath_cross-build.patch Normal file
View file

@ -0,0 +1,25 @@
From 9345a1ad95cc263f99ef124c7a386fb5aaa5405b Mon Sep 17 00:00:00 2001
From: androidbuilder <androidbuilder@example.com>
Date: Fri, 7 Feb 2014 22:18:12 +0000
Subject: [PATCH] fix
---
system-filepath.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system-filepath.cabal b/system-filepath.cabal
index d5fbbdd..efdf9ca 100644
--- a/system-filepath.cabal
+++ b/system-filepath.cabal
@@ -6,7 +6,7 @@ license-file: license.txt
author: John Millikin <jmillikin@gmail.com>
maintainer: John Millikin <jmillikin@gmail.com>
copyright: John Millikin 2010-2012
-build-type: Custom
+build-type: Simple
cabal-version: >= 1.6
category: System
stability: experimental
--
1.7.10.4

2
standalone/android/install-haskell-packages
View file

@ -106,6 +106,8 @@ install_pkgs () {
patched uuid patched uuid
patched dns patched dns
patched gnutls patched gnutls
patched libxml-sax
patched network-protocol-xmpp
cd .. cd ..

53
standalone/no-th/haskell-patches/DAV_build-without-TH.patch
View file

@ -1,27 +1,22 @@
From 67e5fc4eb21fe801f7ab4c01b98c02912c5cb43f Mon Sep 17 00:00:00 2001 From a908cec3ae1644d72d04ccc7657433d8335665bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net> From: dummy <dummy@example.com>
Date: Wed, 18 Dec 2013 05:44:10 +0000 Date: Sat, 8 Feb 2014 17:11:05 +0000
Subject: [PATCH] expand TH Subject: [PATCH] expand TH
plus manual fixups
--- ---
DAV.cabal | 22 +--- DAV.cabal | 24 +---
Network/Protocol/HTTP/DAV.hs | 96 +++++++++++++---- Network/Protocol/HTTP/DAV.hs | 96 ++++++++++++----
Network/Protocol/HTTP/DAV/TH.hs | 232 +++++++++++++++++++++++++++++++++++++++- Network/Protocol/HTTP/DAV/TH.hs | 232 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 307 insertions(+), 43 deletions(-) 3 files changed, 307 insertions(+), 45 deletions(-)
diff --git a/DAV.cabal b/DAV.cabal diff --git a/DAV.cabal b/DAV.cabal
index 1f1eb1f..ea117ff 100644 index 3a755bb..748b0e1 100644
--- a/DAV.cabal --- a/DAV.cabal
+++ b/DAV.cabal +++ b/DAV.cabal
@@ -36,27 +36,7 @@ library @@ -42,29 +42,7 @@ library
, lifted-base >= 0.1 , transformers-base
, monad-control , xml-conduit >= 1.0 && <= 1.2
, mtl >= 2.1 , xml-hamlet >= 0.4 && <= 0.5
- , transformers >= 0.3
- , transformers-base
- , xml-conduit >= 1.0 && <= 1.2
- , xml-hamlet >= 0.4 && <= 0.5
-executable hdav -executable hdav
- main-is: hdav.hs - main-is: hdav.hs
- ghc-options: -Wall - ghc-options: -Wall
@ -30,24 +25,30 @@ index 1f1eb1f..ea117ff 100644
- , bytestring - , bytestring
- , case-insensitive >= 0.4 - , case-insensitive >= 0.4
- , containers - , containers
- , either >= 4.1
- , errors
- , http-client >= 0.2 - , http-client >= 0.2
- , http-client-tls >= 0.2 - , http-client-tls >= 0.2
- , http-types >= 0.7 - , http-types >= 0.7
- , lens >= 3.0 - , lens >= 3.0
- , lifted-base >= 0.1 - , lifted-base >= 0.1
- , monad-control - , monad-control >= 0.3.2
- , mtl >= 2.1 - , mtl >= 2.1
- , network >= 2.3 - , network >= 2.3
- , optparse-applicative - , optparse-applicative >= 0.5.0
- , transformers >= 0.3
- , transformers-base
- , xml-conduit >= 1.0 && <= 1.2
- , xml-hamlet >= 0.4 && <= 0.5
+ , text + , text
, transformers >= 0.3
, transformers-base source-repository head
, xml-conduit >= 1.0 && <= 1.2 type: git
diff --git a/Network/Protocol/HTTP/DAV.hs b/Network/Protocol/HTTP/DAV.hs diff --git a/Network/Protocol/HTTP/DAV.hs b/Network/Protocol/HTTP/DAV.hs
index 9d8c070..5993fca 100644 index 94d21bc..c48618f 100644
--- a/Network/Protocol/HTTP/DAV.hs --- a/Network/Protocol/HTTP/DAV.hs
+++ b/Network/Protocol/HTTP/DAV.hs +++ b/Network/Protocol/HTTP/DAV.hs
@@ -77,7 +77,7 @@ import Network.HTTP.Types (hContentType, Method, Status, RequestHeaders, unautho @@ -78,7 +78,7 @@ import Network.HTTP.Types (hContentType, Method, Status, RequestHeaders, unautho
import qualified Text.XML as XML import qualified Text.XML as XML
import Text.XML.Cursor (($/), (&/), element, node, fromDocument, checkName) import Text.XML.Cursor (($/), (&/), element, node, fromDocument, checkName)
@ -56,7 +57,7 @@ index 9d8c070..5993fca 100644
import Data.CaseInsensitive (mk) import Data.CaseInsensitive (mk)
@@ -335,28 +335,84 @@ makeCollection url username password = choke $ evalDAVT url $ do @@ -336,28 +336,84 @@ makeCollection url username password = choke $ evalDAVT url $ do
propname :: XML.Document propname :: XML.Document
propname = XML.Document (XML.Prologue [] Nothing []) root [] propname = XML.Document (XML.Prologue [] Nothing []) root []
where where
@ -410,5 +411,5 @@ index b072116..5a01bf9 100644
+ Data.Functor.<$> (_f_a2R5 __userAgent'_a2Re)) + Data.Functor.<$> (_f_a2R5 __userAgent'_a2Re))
+{-# INLINE userAgent #-} +{-# INLINE userAgent #-}
-- --
1.8.5.1 1.7.10.4

174
standalone/no-th/haskell-patches/lens_no-TH.patch
View file

@ -1,52 +1,58 @@
From 2b5fa1851a84f58b43e7c4224bd5695a32a80de9 Mon Sep 17 00:00:00 2001 From b9b3cd52735f9ede1a83960968dc1f0e91e061d6 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com> From: dummy <dummy@example.com>
Date: Wed, 18 Dec 2013 03:27:54 +0000 Date: Fri, 7 Feb 2014 21:49:11 +0000
Subject: [PATCH] avoid TH Subject: [PATCH] avoid TH
--- ---
lens.cabal | 13 +------------ lens.cabal | 14 +-------------
src/Control/Lens.hs | 4 ++-- src/Control/Lens.hs | 6 ++----
src/Control/Lens/Internal/Exception.hs | 30 ------------------------------ src/Control/Lens/Cons.hs | 2 --
src/Control/Lens/Prism.hs | 2 -- src/Control/Lens/Internal/Fold.hs | 2 --
4 files changed, 3 insertions(+), 46 deletions(-) src/Control/Lens/Internal/Reflection.hs | 2 --
src/Control/Lens/Prism.hs | 2 --
src/Control/Monad/Primitive/Lens.hs | 1 -
7 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/lens.cabal b/lens.cabal diff --git a/lens.cabal b/lens.cabal
index 8477892..a6ac7a5 100644 index cee2da7..1e467c4 100644
--- a/lens.cabal --- a/lens.cabal
+++ b/lens.cabal +++ b/lens.cabal
@@ -10,7 +10,7 @@ stability: provisional @@ -10,7 +10,7 @@ stability: provisional
homepage: http://github.com/ekmett/lens/ homepage: http://github.com/ekmett/lens/
bug-reports: http://github.com/ekmett/lens/issues bug-reports: http://github.com/ekmett/lens/issues
copyright: Copyright (C) 2012-2013 Edward A. Kmett copyright: Copyright (C) 2012-2014 Edward A. Kmett
-build-type: Custom -build-type: Custom
+build-type: Simple +build-type: Simple
-- build-tools: cpphs
tested-with: GHC == 7.6.3 tested-with: GHC == 7.6.3
synopsis: Lenses, Folds and Traversals synopsis: Lenses, Folds and Traversals
description: @@ -216,7 +216,6 @@ library
@@ -173,7 +173,6 @@ library Control.Exception.Lens
containers >= 0.4.0 && < 0.6, Control.Lens
distributive >= 0.3 && < 1, Control.Lens.Action
filepath >= 1.2.0.0 && < 1.4, - Control.Lens.At
- generic-deriving >= 1.4 && < 1.7, Control.Lens.Combinators
ghc-prim, Control.Lens.Cons
hashable >= 1.1.2.3 && < 1.3, Control.Lens.Each
MonadCatchIO-transformers >= 0.3 && < 0.4, @@ -256,17 +255,14 @@ library
@@ -235,14 +234,12 @@ library Control.Lens.Reified
Control.Lens.Review Control.Lens.Review
Control.Lens.Setter Control.Lens.Setter
Control.Lens.Simple
- Control.Lens.TH - Control.Lens.TH
Control.Lens.Traversal Control.Lens.Traversal
Control.Lens.Tuple Control.Lens.Tuple
Control.Lens.Type Control.Lens.Type
Control.Lens.Wrapped Control.Lens.Wrapped
Control.Lens.Zipper
Control.Lens.Zoom Control.Lens.Zoom
- Control.Monad.Error.Lens - Control.Monad.Error.Lens
Control.Monad.Primitive.Lens
Control.Parallel.Strategies.Lens Control.Parallel.Strategies.Lens
Control.Seq.Lens Control.Seq.Lens
- Data.Aeson.Lens
Data.Array.Lens Data.Array.Lens
@@ -266,12 +263,8 @@ library Data.Bits.Lens
Data.ByteString.Lens
@@ -289,12 +285,8 @@ library
Data.Typeable.Lens Data.Typeable.Lens
Data.Vector.Lens Data.Vector.Lens
Data.Vector.Generic.Lens Data.Vector.Generic.Lens
@ -58,8 +64,8 @@ index 8477892..a6ac7a5 100644
- Language.Haskell.TH.Lens - Language.Haskell.TH.Lens
Numeric.Lens Numeric.Lens
if flag(safe) other-modules:
@@ -370,7 +363,6 @@ test-suite doctests @@ -394,7 +386,6 @@ test-suite doctests
deepseq, deepseq,
doctest >= 0.9.1, doctest >= 0.9.1,
filepath, filepath,
@ -67,7 +73,7 @@ index 8477892..a6ac7a5 100644
mtl, mtl,
nats, nats,
parallel, parallel,
@@ -396,7 +388,6 @@ benchmark plated @@ -432,7 +423,6 @@ benchmark plated
comonad, comonad,
criterion, criterion,
deepseq, deepseq,
@ -75,7 +81,7 @@ index 8477892..a6ac7a5 100644
lens, lens,
transformers transformers
@@ -431,7 +422,6 @@ benchmark unsafe @@ -467,7 +457,6 @@ benchmark unsafe
comonads-fd, comonads-fd,
criterion, criterion,
deepseq, deepseq,
@ -83,7 +89,7 @@ index 8477892..a6ac7a5 100644
lens, lens,
transformers transformers
@@ -448,6 +438,5 @@ benchmark zipper @@ -484,6 +473,5 @@ benchmark zipper
comonads-fd, comonads-fd,
criterion, criterion,
deepseq, deepseq,
@ -91,77 +97,87 @@ index 8477892..a6ac7a5 100644
lens, lens,
transformers transformers
diff --git a/src/Control/Lens.hs b/src/Control/Lens.hs diff --git a/src/Control/Lens.hs b/src/Control/Lens.hs
index f7c6548..125153e 100644 index 7e15267..bb4d87b 100644
--- a/src/Control/Lens.hs --- a/src/Control/Lens.hs
+++ b/src/Control/Lens.hs +++ b/src/Control/Lens.hs
@@ -59,7 +59,7 @@ module Control.Lens @@ -41,7 +41,6 @@
----------------------------------------------------------------------------
module Control.Lens
( module Control.Lens.Action
- , module Control.Lens.At
, module Control.Lens.Cons
, module Control.Lens.Each
, module Control.Lens.Empty
@@ -58,7 +57,7 @@ module Control.Lens
, module Control.Lens.Reified
, module Control.Lens.Review , module Control.Lens.Review
, module Control.Lens.Setter , module Control.Lens.Setter
, module Control.Lens.Simple
-#ifndef DISABLE_TEMPLATE_HASKELL -#ifndef DISABLE_TEMPLATE_HASKELL
+#if 0 +#if 0
, module Control.Lens.TH , module Control.Lens.TH
#endif #endif
, module Control.Lens.Traversal , module Control.Lens.Traversal
@@ -89,7 +89,7 @@ import Control.Lens.Reified @@ -69,7 +68,6 @@ module Control.Lens
) where
import Control.Lens.Action
-import Control.Lens.At
import Control.Lens.Cons
import Control.Lens.Each
import Control.Lens.Empty
@@ -86,7 +84,7 @@ import Control.Lens.Prism
import Control.Lens.Reified
import Control.Lens.Review import Control.Lens.Review
import Control.Lens.Setter import Control.Lens.Setter
import Control.Lens.Simple
-#ifndef DISABLE_TEMPLATE_HASKELL -#ifndef DISABLE_TEMPLATE_HASKELL
+#if 0 +#if 0
import Control.Lens.TH import Control.Lens.TH
#endif #endif
import Control.Lens.Traversal import Control.Lens.Traversal
diff --git a/src/Control/Lens/Internal/Exception.hs b/src/Control/Lens/Internal/Exception.hs diff --git a/src/Control/Lens/Cons.hs b/src/Control/Lens/Cons.hs
index 387203e..bb1ca10 100644 index a80e9c8..7d27b80 100644
--- a/src/Control/Lens/Internal/Exception.hs --- a/src/Control/Lens/Cons.hs
+++ b/src/Control/Lens/Internal/Exception.hs +++ b/src/Control/Lens/Cons.hs
@@ -128,18 +128,6 @@ class Handleable e (m :: * -> *) (h :: * -> *) | h -> e m where @@ -55,8 +55,6 @@ import Data.Vector.Unboxed (Unbox)
handler_ l = handler l . const import qualified Data.Vector.Unboxed as Unbox
{-# INLINE handler_ #-} import Data.Word
-instance Handleable SomeException IO Exception.Handler where -{-# ANN module "HLint: ignore Eta reduce" #-}
- handler = handlerIO
- -
-instance Handleable SomeException m (CatchIO.Handler m) where -- $setup
- handler = handlerCatchIO -- >>> :set -XNoOverloadedStrings
- -- >>> import Control.Lens
-handlerIO :: forall a r. Getting (First a) SomeException a -> (a -> IO r) -> Exception.Handler r diff --git a/src/Control/Lens/Internal/Fold.hs b/src/Control/Lens/Internal/Fold.hs
-handlerIO l f = reify (preview l) $ \ (_ :: Proxy s) -> Exception.Handler (\(Handling a :: Handling a s IO) -> f a) index 00e4b66..03c9cd2 100644
- --- a/src/Control/Lens/Internal/Fold.hs
-handlerCatchIO :: forall m a r. Getting (First a) SomeException a -> (a -> m r) -> CatchIO.Handler m r +++ b/src/Control/Lens/Internal/Fold.hs
-handlerCatchIO l f = reify (preview l) $ \ (_ :: Proxy s) -> CatchIO.Handler (\(Handling a :: Handling a s m) -> f a) @@ -37,8 +37,6 @@ import Data.Maybe
import Data.Semigroup hiding (Min, getMin, Max, getMax)
import Data.Reflection
-{-# ANN module "HLint: ignore Avoid lambda" #-}
- -
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Helpers -- Folding
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
@@ -159,21 +147,3 @@ supply = unsafePerformIO $ newIORef 0 diff --git a/src/Control/Lens/Internal/Reflection.hs b/src/Control/Lens/Internal/Reflection.hs
-- | This permits the construction of an \"impossible\" 'Control.Exception.Handler' that matches only if some function does. index bf09f2c..c9e112f 100644
newtype Handling a s (m :: * -> *) = Handling a --- 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
--- the m parameter exists simply to break the Typeable1 pattern, so we can provide this without overlap. -{-# ANN module "HLint: ignore Avoid lambda" #-}
--- here we simply generate a fresh TypeRep so we'll fail to compare as equal to any other TypeRep.
-instance Typeable (Handling a s m) where
- typeOf _ = unsafePerformIO $ do
- i <- atomicModifyIORef supply $ \a -> let a' = a + 1 in a' `seq` (a', a)
- return $ mkTyConApp (mkTyCon3 "lens" "Control.Lens.Internal.Exception" ("Handling" ++ show i)) []
- {-# INLINE typeOf #-}
- -
--- The @Handling@ wrapper is uninteresting, and should never be thrown, so you won't get much benefit here. class Typeable s => B s where
-instance Show (Handling a s m) where reflectByte :: proxy s -> IntPtr
- showsPrec d _ = showParen (d > 10) $ showString "Handling ..."
- {-# INLINE showsPrec #-}
-
-instance Reifies s (SomeException -> Maybe a) => Exception (Handling a s m) where
- toException _ = SomeException HandlingException
- {-# INLINE toException #-}
- fromException = fmap Handling . reflect (Proxy :: Proxy s)
- {-# INLINE fromException #-}
diff --git a/src/Control/Lens/Prism.hs b/src/Control/Lens/Prism.hs diff --git a/src/Control/Lens/Prism.hs b/src/Control/Lens/Prism.hs
index 45b5cfe..88c7ff9 100644 index 9e0bec7..0cf6737 100644
--- a/src/Control/Lens/Prism.hs --- a/src/Control/Lens/Prism.hs
+++ b/src/Control/Lens/Prism.hs +++ b/src/Control/Lens/Prism.hs
@@ -53,8 +53,6 @@ import Unsafe.Coerce @@ -59,8 +59,6 @@ import Unsafe.Coerce
import Data.Profunctor.Unsafe import Data.Profunctor.Unsafe
#endif #endif
@ -170,6 +186,18 @@ index 45b5cfe..88c7ff9 100644
-- $setup -- $setup
-- >>> :set -XNoOverloadedStrings -- >>> :set -XNoOverloadedStrings
-- >>> import Control.Lens -- >>> import Control.Lens
diff --git a/src/Control/Monad/Primitive/Lens.hs b/src/Control/Monad/Primitive/Lens.hs
index ee942c6..2f37134 100644
--- a/src/Control/Monad/Primitive/Lens.hs
+++ b/src/Control/Monad/Primitive/Lens.hs
@@ -20,7 +20,6 @@ import Control.Lens
import Control.Monad.Primitive (PrimMonad(..))
import GHC.Prim (State#)
-{-# ANN module "HLint: ignore Unused LANGUAGE pragma" #-}
prim :: (PrimMonad m) => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
prim = iso internal primitive
-- --
1.8.5.1 1.7.10.4

81
standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
View file

@ -1,17 +1,17 @@
From 08cc43788c16fb91f63bc0bd520eeccdcdab477a Mon Sep 17 00:00:00 2001 From 5f30a68faaa379ac3fe9f0b016dd1a20969d548f Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com> From: dummy <dummy@example.com>
Date: Tue, 17 Dec 2013 17:15:33 +0000 Date: Fri, 7 Feb 2014 23:04:06 +0000
Subject: [PATCH] remove and expand TH Subject: [PATCH] remove and expand TH
--- ---
Yesod/Core.hs | 30 +++--- Yesod/Core.hs | 30 +++---
Yesod/Core/Class/Yesod.hs | 249 +++++++++++++++++++++++++++++++-------------- Yesod/Core/Class/Yesod.hs | 248 ++++++++++++++++++++++++++++++--------------
Yesod/Core/Dispatch.hs | 27 ++--- Yesod/Core/Dispatch.hs | 37 ++-----
Yesod/Core/Handler.hs | 25 ++--- Yesod/Core/Handler.hs | 25 ++---
Yesod/Core/Internal/Run.hs | 4 +- Yesod/Core/Internal/Run.hs | 4 +-
Yesod/Core/Internal/TH.hs | 111 -------------------- Yesod/Core/Internal/TH.hs | 111 --------------------
Yesod/Core/Widget.hs | 32 +----- Yesod/Core/Widget.hs | 32 +-----
7 files changed, 209 insertions(+), 269 deletions(-) 7 files changed, 209 insertions(+), 278 deletions(-)
diff --git a/Yesod/Core.hs b/Yesod/Core.hs diff --git a/Yesod/Core.hs b/Yesod/Core.hs
index 12e59d5..2817a69 100644 index 12e59d5..2817a69 100644
@ -67,7 +67,7 @@ index 12e59d5..2817a69 100644
, renderCssUrl , renderCssUrl
) where ) where
diff --git a/Yesod/Core/Class/Yesod.hs b/Yesod/Core/Class/Yesod.hs diff --git a/Yesod/Core/Class/Yesod.hs b/Yesod/Core/Class/Yesod.hs
index a64d6eb..5dffbfa 100644 index 140600b..6c718e2 100644
--- a/Yesod/Core/Class/Yesod.hs --- a/Yesod/Core/Class/Yesod.hs
+++ b/Yesod/Core/Class/Yesod.hs +++ b/Yesod/Core/Class/Yesod.hs
@@ -5,11 +5,15 @@ @@ -5,11 +5,15 @@
@ -127,7 +127,7 @@ index a64d6eb..5dffbfa 100644
-- | Override the rendering function for a particular URL. One use case for -- | Override the rendering function for a particular URL. One use case for
-- this is to offload static hosting to a different domain name to avoid -- this is to offload static hosting to a different domain name to avoid
@@ -370,45 +383,103 @@ widgetToPageContent w = do @@ -374,45 +387,103 @@ widgetToPageContent w = do
-- modernizr should be at the end of the <head> http://www.modernizr.com/docs/#installing -- modernizr should be at the end of the <head> http://www.modernizr.com/docs/#installing
-- the asynchronous loader means your page doesn't have to wait for all the js to load -- the asynchronous loader means your page doesn't have to wait for all the js to load
let (mcomplete, asyncScripts) = asyncHelper render scripts jscript jsLoc let (mcomplete, asyncScripts) = asyncHelper render scripts jscript jsLoc
@ -270,7 +270,7 @@ index a64d6eb..5dffbfa 100644
return $ PageContent title headAll $ return $ PageContent title headAll $
case jsLoader master of case jsLoader master of
@@ -438,10 +509,13 @@ defaultErrorHandler NotFound = selectRep $ do @@ -442,10 +513,13 @@ defaultErrorHandler NotFound = selectRep $ do
r <- waiRequest r <- waiRequest
let path' = TE.decodeUtf8With TEE.lenientDecode $ W.rawPathInfo r let path' = TE.decodeUtf8With TEE.lenientDecode $ W.rawPathInfo r
setTitle "Not Found" setTitle "Not Found"
@ -288,7 +288,7 @@ index a64d6eb..5dffbfa 100644
provideRep $ return $ object ["message" .= ("Not Found" :: Text)] provideRep $ return $ object ["message" .= ("Not Found" :: Text)]
-- For API requests. -- For API requests.
@@ -451,10 +525,11 @@ defaultErrorHandler NotFound = selectRep $ do @@ -455,10 +529,11 @@ defaultErrorHandler NotFound = selectRep $ do
defaultErrorHandler NotAuthenticated = selectRep $ do defaultErrorHandler NotAuthenticated = selectRep $ do
provideRep $ defaultLayout $ do provideRep $ defaultLayout $ do
setTitle "Not logged in" setTitle "Not logged in"
@ -304,7 +304,7 @@ index a64d6eb..5dffbfa 100644
provideRep $ do provideRep $ do
-- 401 *MUST* include a WWW-Authenticate header -- 401 *MUST* include a WWW-Authenticate header
@@ -476,10 +551,13 @@ defaultErrorHandler NotAuthenticated = selectRep $ do @@ -480,10 +555,13 @@ defaultErrorHandler NotAuthenticated = selectRep $ do
defaultErrorHandler (PermissionDenied msg) = selectRep $ do defaultErrorHandler (PermissionDenied msg) = selectRep $ do
provideRep $ defaultLayout $ do provideRep $ defaultLayout $ do
setTitle "Permission Denied" setTitle "Permission Denied"
@ -322,7 +322,7 @@ index a64d6eb..5dffbfa 100644
provideRep $ provideRep $
return $ object $ [ return $ object $ [
"message" .= ("Permission Denied. " <> msg) "message" .= ("Permission Denied. " <> msg)
@@ -488,30 +566,43 @@ defaultErrorHandler (PermissionDenied msg) = selectRep $ do @@ -492,30 +570,42 @@ defaultErrorHandler (PermissionDenied msg) = selectRep $ do
defaultErrorHandler (InvalidArgs ia) = selectRep $ do defaultErrorHandler (InvalidArgs ia) = selectRep $ do
provideRep $ defaultLayout $ do provideRep $ defaultLayout $ do
setTitle "Invalid Arguments" setTitle "Invalid Arguments"
@ -377,15 +377,19 @@ index a64d6eb..5dffbfa 100644
+ id + id
+ ((Text.Blaze.Internal.preEscapedText . T.pack) + ((Text.Blaze.Internal.preEscapedText . T.pack)
+ "</code> not supported</p>") } + "</code> not supported</p>") }
+ provideRep $ return $ object ["message" .= ("Bad method" :: Text), "method" .= TE.decodeUtf8With TEE.lenientDecode m]
provideRep $ return $ object ["message" .= ("Bad method" :: Text), "method" .= m]
asyncHelper :: (url -> [x] -> Text) asyncHelper :: (url -> [x] -> Text)
diff --git a/Yesod/Core/Dispatch.hs b/Yesod/Core/Dispatch.hs diff --git a/Yesod/Core/Dispatch.hs b/Yesod/Core/Dispatch.hs
index df822e2..5583495 100644 index e6f489d..3ff37c1 100644
--- a/Yesod/Core/Dispatch.hs --- a/Yesod/Core/Dispatch.hs
+++ b/Yesod/Core/Dispatch.hs +++ b/Yesod/Core/Dispatch.hs
@@ -6,18 +6,18 @@ @@ -1,4 +1,3 @@
-{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE FlexibleInstances #-}
@@ -6,18 +5,18 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
module Yesod.Core.Dispatch module Yesod.Core.Dispatch
( -- * Quasi-quoted routing ( -- * Quasi-quoted routing
@ -414,7 +418,7 @@ index df822e2..5583495 100644
, PathMultiPiece (..) , PathMultiPiece (..)
, Texts , Texts
-- * Convert to WAI -- * Convert to WAI
@@ -124,13 +124,6 @@ toWaiApp site = do @@ -128,13 +127,6 @@ toWaiAppLogger logger site = do
, yreSite = site , yreSite = site
, yreSessionBackend = sb , yreSessionBackend = sb
} }
@ -428,8 +432,31 @@ index df822e2..5583495 100644
middleware <- mkDefaultMiddlewares logger middleware <- mkDefaultMiddlewares logger
return $ middleware $ toWaiAppYre yre return $ middleware $ toWaiAppYre yre
@@ -163,13 +155,7 @@ warp port site = do
]
-}
, Network.Wai.Handler.Warp.settingsOnException = const $ \e ->
- messageLoggerSource
- site
- logger
- $(qLocation >>= liftLoc)
- "yesod-core"
- LevelError
- (toLogStr $ "Exception from Warp: " ++ show e)
+ error (show e)
}
-- | A default set of middlewares.
@@ -194,7 +180,6 @@ mkDefaultMiddlewares logger = do
-- | Deprecated synonym for 'warp'.
warpDebug :: YesodDispatch site => Int -> site -> IO ()
warpDebug = warp
-{-# DEPRECATED warpDebug "Please use warp instead" #-}
-- | 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 diff --git a/Yesod/Core/Handler.hs b/Yesod/Core/Handler.hs
index 3581dbc..908256e 100644 index 7c561c5..847d475 100644
--- a/Yesod/Core/Handler.hs --- a/Yesod/Core/Handler.hs
+++ b/Yesod/Core/Handler.hs +++ b/Yesod/Core/Handler.hs
@@ -164,7 +164,7 @@ import Data.Text.Encoding (decodeUtf8With, encodeUtf8) @@ -164,7 +164,7 @@ import Data.Text.Encoding (decodeUtf8With, encodeUtf8)
@ -449,7 +476,7 @@ index 3581dbc..908256e 100644
get :: MonadHandler m => m GHState get :: MonadHandler m => m GHState
get = liftHandlerT $ HandlerT $ I.readIORef . handlerState get = liftHandlerT $ HandlerT $ I.readIORef . handlerState
@@ -743,19 +744,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url) @@ -748,19 +749,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
-> m a -> m a
redirectToPost url = do redirectToPost url = do
urlText <- toTextUrl url urlText <- toTextUrl url
@ -479,10 +506,10 @@ index 3581dbc..908256e 100644
-- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'. -- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'.
hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html
diff --git a/Yesod/Core/Internal/Run.hs b/Yesod/Core/Internal/Run.hs diff --git a/Yesod/Core/Internal/Run.hs b/Yesod/Core/Internal/Run.hs
index 25f51f1..d04d2cd 100644 index 10871a2..6ed631e 100644
--- a/Yesod/Core/Internal/Run.hs --- a/Yesod/Core/Internal/Run.hs
+++ b/Yesod/Core/Internal/Run.hs +++ b/Yesod/Core/Internal/Run.hs
@@ -15,7 +15,7 @@ import Control.Exception.Lifted (catch) @@ -16,7 +16,7 @@ import Control.Exception.Lifted (catch)
import Control.Monad.IO.Class (MonadIO) import Control.Monad.IO.Class (MonadIO)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Control.Monad.Logger (LogLevel (LevelError), LogSource, import Control.Monad.Logger (LogLevel (LevelError), LogSource,
@ -491,7 +518,7 @@ index 25f51f1..d04d2cd 100644
import Control.Monad.Trans.Resource (runResourceT, withInternalState, runInternalState, createInternalState, closeInternalState) import Control.Monad.Trans.Resource (runResourceT, withInternalState, runInternalState, createInternalState, closeInternalState)
import qualified Data.ByteString as S import qualified Data.ByteString as S
import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString.Char8 as S8
@@ -128,8 +128,6 @@ safeEh :: (Loc -> LogSource -> LogLevel -> LogStr -> IO ()) @@ -131,8 +131,6 @@ safeEh :: (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
-> ErrorResponse -> ErrorResponse
-> YesodApp -> YesodApp
safeEh log' er req = do safeEh log' er req = do
@ -680,5 +707,5 @@ index a972efa..156cd45 100644
ihamletToRepHtml :: (MonadHandler m, RenderMessage (HandlerSite m) message) ihamletToRepHtml :: (MonadHandler m, RenderMessage (HandlerSite m) message)
=> HtmlUrlI18n message (Route (HandlerSite m)) => HtmlUrlI18n message (Route (HandlerSite m))
-- --
1.8.5.1 1.7.10.4

30
standalone/no-th/haskell-patches/yesod-form_spliced-TH.patch
View file

@ -1,19 +1,19 @@
From fbd8f048c239e34625e438a24213534f6f68c3e8 Mon Sep 17 00:00:00 2001 From 9f62992414f900fcafa00a838925e24c4365c50f Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com> From: dummy <dummy@example.com>
Date: Tue, 17 Dec 2013 18:34:25 +0000 Date: Fri, 7 Feb 2014 23:11:31 +0000
Subject: [PATCH] spliced TH Subject: [PATCH] splice TH
--- ---
Yesod/Form/Fields.hs | 771 ++++++++++++++++++++++++++++++++++++------------ Yesod/Form/Fields.hs | 771 +++++++++++++++++++++++++++++++++++------------
Yesod/Form/Functions.hs | 239 ++++++++++++--- Yesod/Form/Functions.hs | 239 ++++++++++++---
Yesod/Form/Jquery.hs | 129 ++++++-- Yesod/Form/Jquery.hs | 129 ++++++--
Yesod/Form/MassInput.hs | 233 ++++++++++++--- Yesod/Form/MassInput.hs | 233 +++++++++++---
Yesod/Form/Nic.hs | 65 +++- Yesod/Form/Nic.hs | 65 +++-
yesod-form.cabal | 1 + yesod-form.cabal | 1 +
6 files changed, 1127 insertions(+), 311 deletions(-) 6 files changed, 1127 insertions(+), 311 deletions(-)
diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs
index b2a47c6..016c98b 100644 index 97d0034..016c98b 100644
--- a/Yesod/Form/Fields.hs --- a/Yesod/Form/Fields.hs
+++ b/Yesod/Form/Fields.hs +++ b/Yesod/Form/Fields.hs
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
@ -74,7 +74,7 @@ index b2a47c6..016c98b 100644
- , fieldView = \theId name attrs val isReq -> toWidget [hamlet| - , fieldView = \theId name attrs val isReq -> toWidget [hamlet|
-$newline never -$newline never
-<input id="#{theId}" name="#{name}" *{attrs} type="number" :isReq:required="" value="#{showVal val}"> -<input id="#{theId}" name="#{name}" *{attrs} type="number" step=1 :isReq:required="" value="#{showVal val}">
-|] -|]
+ , fieldView = \theId name attrs val isReq -> toWidget $ \ _render_arOn + , fieldView = \theId name attrs val isReq -> toWidget $ \ _render_arOn
+ -> do { id + -> do { id
@ -103,7 +103,7 @@ index b2a47c6..016c98b 100644
- , fieldView = \theId name attrs val isReq -> toWidget [hamlet| - , fieldView = \theId name attrs val isReq -> toWidget [hamlet|
-$newline never -$newline never
-<input id="#{theId}" name="#{name}" *{attrs} type="text" :isReq:required="" value="#{showVal val}"> -<input id="#{theId}" name="#{name}" *{attrs} type="number" step=any :isReq:required="" value="#{showVal val}">
-|] -|]
+ , fieldView = \theId name attrs val isReq -> toWidget $ \ _render_arOz + , fieldView = \theId name attrs val isReq -> toWidget $ \ _render_arOz
+ -> do { id + -> do { id
@ -1789,7 +1789,7 @@ index 2862678..04ddaba 100644
} }
where where
diff --git a/yesod-form.cabal b/yesod-form.cabal diff --git a/yesod-form.cabal b/yesod-form.cabal
index 9e0c710..a39f71f 100644 index 1f6e0e1..4667861 100644
--- a/yesod-form.cabal --- a/yesod-form.cabal
+++ b/yesod-form.cabal +++ b/yesod-form.cabal
@@ -19,6 +19,7 @@ library @@ -19,6 +19,7 @@ library
@ -1798,8 +1798,8 @@ index 9e0c710..a39f71f 100644
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
+ , shakespeare + , shakespeare
, shakespeare-js >= 1.0.2 && < 1.3 , shakespeare-js >= 1.0.2 && < 1.3
, persistent >= 1.2 && < 1.3 , persistent >= 1.2 && < 1.4
, template-haskell , template-haskell
-- --
1.8.5.1 1.7.10.4

54
standalone/no-th/haskell-patches/yesod_hack-TH.patch
View file

@ -1,12 +1,13 @@
From e3d1ead4f02c2c45e64a1ccad5b461cc6fdabbd2 Mon Sep 17 00:00:00 2001 From 69398345ff1e63bcc6a23fce18e42390328b78d2 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com> From: dummy <dummy@example.com>
Date: Tue, 17 Dec 2013 18:48:56 +0000 Date: Tue, 17 Dec 2013 18:48:56 +0000
Subject: [PATCH] hack for TH Subject: [PATCH] hack for TH
--- ---
Yesod.hs | 19 ++++++++++++-- Yesod.hs | 19 ++++++++++++--
Yesod/Default/Util.hs | 69 ++------------------------------------------------- Yesod/Default/Main.hs | 23 -----------------
2 files changed, 19 insertions(+), 69 deletions(-) Yesod/Default/Util.hs | 69 ++-----------------------------------------------
3 files changed, 19 insertions(+), 92 deletions(-)
diff --git a/Yesod.hs b/Yesod.hs diff --git a/Yesod.hs b/Yesod.hs
index b367144..fbe309c 100644 index b367144..fbe309c 100644
@ -39,6 +40,49 @@ index b367144..fbe309c 100644
+delete = undefined +delete = undefined
+insert = undefined +insert = undefined
+ +
diff --git a/Yesod/Default/Main.hs b/Yesod/Default/Main.hs
index 0780539..2c73800 100644
--- a/Yesod/Default/Main.hs
+++ b/Yesod/Default/Main.hs
@@ -1,10 +1,8 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TemplateHaskell #-}
module Yesod.Default.Main
( defaultMain
- , defaultMainLog
, defaultRunner
, defaultDevelApp
, LogFunc
@@ -54,27 +52,6 @@ defaultMain load getApp = do
type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO ()
--- | Same as @defaultMain@, but gets a logging function back as well as an
--- @Application@ to install Warp exception handlers.
---
--- Since 1.2.5
-defaultMainLog :: (Show env, Read env)
- => IO (AppConfig env extra)
- -> (AppConfig env extra -> IO (Application, LogFunc))
- -> IO ()
-defaultMainLog load getApp = do
- config <- load
- (app, logFunc) <- getApp config
- runSettings defaultSettings
- { settingsPort = appPort config
- , settingsHost = appHost config
- , settingsOnException = const $ \e -> logFunc
- $(qLocation >>= liftLoc)
- "yesod"
- LevelError
- (toLogStr $ "Exception from Warp: " ++ show e)
- } app
-
-- | Run your application continously, listening for SIGINT and exiting
-- when received
--
diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs
index a10358e..0547424 100644 index a10358e..0547424 100644
--- a/Yesod/Default/Util.hs --- a/Yesod/Default/Util.hs
@ -136,5 +180,5 @@ index a10358e..0547424 100644
- else return $ Just ex - else return $ Just ex
- else return Nothing - else return Nothing
-- --
1.8.5.1 1.7.10.4