[Pkg-haskell-commits] [package-plan] 01/03: Add some missing patches
Joachim Breitner
nomeata at moszumanska.debian.org
Wed Apr 16 11:58:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch master
in repository package-plan.
commit 10777b6d8829a18259c89a247eb155f7c784f9c0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Wed Apr 16 13:57:43 2014 +0200
Add some missing patches
---
patches/lens/4.1.2/add-without-th-flag.patch | 131 +++++++++++++
.../4.1.2/fix-doctest-float-implementations.diff | 20 ++
patches/lens/4.1.2/fix-doctest-path.hs | 14 ++
patches/lens/4.1.2/fudge-doctest-nonascii.diff | 29 +++
patches/lens/4.1.2/guard-ANNotations.patch | 205 +++++++++++++++++++++
patches/lens/4.1.2/no-transformers-compat.diff | 10 +
patches/lens/4.1.2/series | 5 +
patches/yesod/1.2.5.2/no-conduit-extra.diff | 10 +
patches/yesod/1.2.5.2/series | 1 +
9 files changed, 425 insertions(+)
diff --git a/patches/lens/4.1.2/add-without-th-flag.patch b/patches/lens/4.1.2/add-without-th-flag.patch
new file mode 100644
index 0000000..e65b7c8
--- /dev/null
+++ b/patches/lens/4.1.2/add-without-th-flag.patch
@@ -0,0 +1,131 @@
+From 42c73dc2026eb8aeeb1cf60ca4102357f3718a06 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey at kitenet.net>
+Date: Tue, 15 Oct 2013 09:56:50 -0400
+Last-Update: 2014-04-14
+Subject: [PATCH 2/3] add without-th flag
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -180,6 +180,11 @@
+ default: False
+ manual: True
+
++-- Avoid bulding modules that need TH
++flag without-th
++ default: False
++ manual: True
++
+ library
+ build-depends:
+ aeson >= 0.7 && < 0.8,
+@@ -200,7 +205,6 @@
+ parallel >= 3.1.0.1 && < 3.3,
+ primitive >= 0.4.0.1 && < 0.6,
+ profunctors >= 4 && < 5,
+- reflection >= 1.1.6 && < 2,
+ scientific >= 0.2 && < 0.3,
+ semigroupoids >= 4 && < 5,
+ semigroups >= 0.8.4 && < 1,
+@@ -246,10 +250,8 @@
+ Control.Lens.Internal.Level
+ Control.Lens.Internal.Magma
+ Control.Lens.Internal.Prism
+- Control.Lens.Internal.Reflection
+ Control.Lens.Internal.Review
+ Control.Lens.Internal.Setter
+- Control.Lens.Internal.TH
+ Control.Lens.Internal.Zoom
+ Control.Lens.Iso
+ Control.Lens.Lens
+@@ -261,7 +263,6 @@
+ Control.Lens.Reified
+ Control.Lens.Review
+ Control.Lens.Setter
+- Control.Lens.TH
+ Control.Lens.Traversal
+ Control.Lens.Tuple
+ Control.Lens.Type
+@@ -294,19 +295,28 @@
+ Data.Typeable.Lens
+ Data.Vector.Lens
+ Data.Vector.Generic.Lens
+- Generics.Deriving.Lens
+- GHC.Generics.Lens
+ System.Exit.Lens
+ System.FilePath.Lens
+- System.IO.Error.Lens
+- Language.Haskell.TH.Lens
+ Numeric.Lens
+
++ cpp-options: -traditional
++
++ if flag(without-th)
++ cpp-options: -DDISABLE_TEMPLATE_HASKELL
++ else
++ build-depends:
++ reflection >= 1.1.6 && < 2
++ exposed-modules:
++ Control.Lens.Internal.Reflection
++ Control.Lens.Internal.TH
++ Control.Lens.TH
++ Generics.Deriving.Lens
++ GHC.Generics.Lens
++ Language.Haskell.TH.Lens
++ System.IO.Error.Lens
+ other-modules:
+ Control.Lens.Internal.TupleIxedTH
+
+- cpp-options: -traditional
+-
+ if flag(safe)
+ cpp-options: -DSAFE=1
+
+@@ -340,6 +350,9 @@
+ ghc-options: -Wall -threaded
+ hs-source-dirs: tests
+
++ if flag(without-th)
++ buildable: False
++
+ if flag(dump-splices)
+ ghc-options: -ddump-splices
+
+--- a/src/Control/Lens/Internal/Exception.hs
++++ b/src/Control/Lens/Internal/Exception.hs
+@@ -39,7 +39,9 @@
+ import Control.Exception as Exception
+ import Control.Lens.Fold
+ import Control.Lens.Getter
++#ifndef DISABLE_TEMPLATE_HASKELL
+ import Control.Lens.Internal.Reflection
++#endif
+ import Control.Monad.Catch as Catch
+ import Data.Monoid
+ import Data.Proxy
+@@ -140,6 +142,7 @@
+ handler_ l = handler l . const
+ {-# INLINE handler_ #-}
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ instance Handleable SomeException IO Exception.Handler where
+ handler = handlerIO
+
+@@ -151,7 +154,7 @@
+
+ handlerCatchIO :: forall m a r. (Typeable a, Typeable1 m) => Getting (First a) SomeException a -> (a -> m r) -> Catch.Handler m r
+ handlerCatchIO l f = reifyTypeable (preview l) $ \ (_ :: Proxy s) -> Catch.Handler (\(Handling a :: Handling a s m) -> f a)
+-
++#endif
+ ------------------------------------------------------------------------------
+ -- Helpers
+ ------------------------------------------------------------------------------
+@@ -197,8 +200,10 @@
+ showsPrec d _ = showParen (d > 10) $ showString "Handling ..."
+ {-# INLINE showsPrec #-}
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ instance (Reifies s (SomeException -> Maybe a), Typeable a, Typeable1 m, Typeable s) => Exception (Handling a s m) where
+ toException _ = SomeException HandlingException
+ {-# INLINE toException #-}
+ fromException = fmap Handling . reflect (Proxy :: Proxy s)
+ {-# INLINE fromException #-}
++#endif
diff --git a/patches/lens/4.1.2/fix-doctest-float-implementations.diff b/patches/lens/4.1.2/fix-doctest-float-implementations.diff
new file mode 100644
index 0000000..d55e275
--- /dev/null
+++ b/patches/lens/4.1.2/fix-doctest-float-implementations.diff
@@ -0,0 +1,20 @@
+Description: Fix doctest with different float implementations
+Author: Johan Kiviniemi <devel at johan.kiviniemi.name>
+Origin: upstream, https://github.com/ekmett/lens/commit/ab2c8ee732ef09f713730ee8f431ef2f53535c3f
+Bug: https://github.com/ekmett/lens/issues/310
+Forwarded: not-needed
+Last-Update: 2013-06-17
+
+--- a/src/Control/Lens/Setter.hs
++++ b/src/Control/Lens/Setter.hs
+@@ -671,8 +671,8 @@
+ -- >>> (a,b) & both **~ c
+ -- (a**c,b**c)
+ --
+--- >>> _2 **~ pi $ (1,3)
+--- (1,31.54428070019754)
++-- >>> _2 **~ 10 $ (3,2)
++-- (3,1024.0)
+ --
+ -- @
+ -- ('**~') :: 'Floating' a => 'Setter'' s a -> a -> s -> s
diff --git a/patches/lens/4.1.2/fix-doctest-path.hs b/patches/lens/4.1.2/fix-doctest-path.hs
new file mode 100644
index 0000000..4927971
--- /dev/null
+++ b/patches/lens/4.1.2/fix-doctest-path.hs
@@ -0,0 +1,14 @@
+--- a/tests/doctests.hsc
++++ b/tests/doctests.hsc
+@@ -54,9 +54,9 @@
+ main :: IO ()
+ main = withUnicode $ getSources >>= \sources -> doctest $
+ "-isrc"
+- : "-idist/build/autogen"
++ : "-idist-ghc/build/autogen"
+ : "-optP-include"
+- : "-optPdist/build/autogen/cabal_macros.h"
++ : "-optPdist-ghc/build/autogen/cabal_macros.h"
+ : "-hide-all-packages"
+ : map ("-package="++) deps ++ sources
+
diff --git a/patches/lens/4.1.2/fudge-doctest-nonascii.diff b/patches/lens/4.1.2/fudge-doctest-nonascii.diff
new file mode 100644
index 0000000..e86f069
--- /dev/null
+++ b/patches/lens/4.1.2/fudge-doctest-nonascii.diff
@@ -0,0 +1,29 @@
+--- a/src/Data/Complex/Lens.hs
++++ b/src/Data/Complex/Lens.hs
+@@ -30,7 +30,7 @@
+
+ -- $setup
+ -- >>> import Debug.SimpleReflect
+--- >>> let { a ≈ b = abs (a - b) < 1e-6; infix 4 ≈ }
++-- >>> let { a ~~ b = abs (a - b) < 1e-6; infix 4 ~~ }
+
+ -- | Access the 'realPart' of a 'Complex' number.
+ --
+@@ -104,7 +104,7 @@
+
+ -- | Access the 'phase' of a 'Complex' number.
+ --
+--- >>> (mkPolar 10 (2-pi) & _phase +~ pi & view _phase) ≈ 2
++-- >>> (mkPolar 10 (2-pi) & _phase +~ pi & view _phase) ~~ 2
+ -- True
+ --
+ -- This isn't /quite/ a legal 'Lens'. Notably the
+@@ -126,7 +126,7 @@
+ -- >>> (2.0 :+ 3.0) & _conjugate . _imagPart -~ 1
+ -- 2.0 :+ 4.0
+ --
+--- >>> (mkPolar 10.0 2.0 ^. _conjugate . _phase) ≈ (-2.0)
++-- >>> (mkPolar 10.0 2.0 ^. _conjugate . _phase) ~~ (-2.0)
+ -- True
+ _conjugate :: RealFloat a => Iso' (Complex a) (Complex a)
+ _conjugate = involuted conjugate
diff --git a/patches/lens/4.1.2/guard-ANNotations.patch b/patches/lens/4.1.2/guard-ANNotations.patch
new file mode 100644
index 0000000..a79ccf7
--- /dev/null
+++ b/patches/lens/4.1.2/guard-ANNotations.patch
@@ -0,0 +1,205 @@
+From 7eae0e500fb5762a2f09939a43fcbb8f6e4ef8af Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey at kitenet.net>
+Date: Tue, 15 Oct 2013 10:03:28 -0400
+Last-Update: 2014-04-14
+Subject: [PATCH 3/3] guard ANNotations
+--- a/src/Control/Lens.hs
++++ b/src/Control/Lens.hs
+@@ -95,6 +95,8 @@
+ import Control.Lens.Wrapped
+ import Control.Lens.Zoom
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
+ #endif
++#endif
+--- a/src/Control/Lens/Equality.hs
++++ b/src/Control/Lens/Equality.hs
+@@ -31,10 +31,12 @@
+ import Control.Lens.Type
+ import Data.Functor.Identity
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use id" #-}
+ {-# ANN module "HLint: ignore Eta reduce" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> import Control.Lens
+@@ -86,4 +88,4 @@
+ -- type of a used argument and avoid @ScopedTypeVariables@ or other ugliness.
+ simple :: Equality' a a
+ simple = id
+-{-# INLINE simple #-}
+\ No newline at end of file
++{-# INLINE simple #-}
+--- a/src/Control/Lens/Fold.hs
++++ b/src/Control/Lens/Fold.hs
+@@ -178,11 +178,13 @@
+ -- >>> let g :: Expr -> Expr; g = Debug.SimpleReflect.Vars.g
+ -- >>> let timingOut :: NFData a => a -> IO a; timingOut = fmap (fromMaybe (error "timeout")) . timeout (5*10^6) . evaluate . force
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Eta reduce" #-}
+ {-# ANN module "HLint: ignore Use camelCase" #-}
+ {-# ANN module "HLint: ignore Use curry" #-}
+ #endif
++#endif
+
+ infixl 8 ^.., ^?, ^?!, ^@.., ^@?, ^@?!
+
+--- a/src/Control/Exception/Lens.hs
++++ b/src/Control/Exception/Lens.hs
+@@ -119,9 +119,11 @@
+ , Maybe(..), Either(..), String
+ )
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use Control.Exception.catch" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Cons.hs
++++ b/src/Control/Lens/Cons.hs
+@@ -55,7 +55,9 @@
+ import qualified Data.Vector.Unboxed as Unbox
+ import Data.Word
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Eta reduce" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Internal/Fold.hs
++++ b/src/Control/Lens/Internal/Fold.hs
+@@ -37,7 +37,9 @@
+ import Data.Semigroup hiding (Min, getMin, Max, getMax)
+ import Data.Reflection
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Avoid lambda" #-}
++#endif
+
+ ------------------------------------------------------------------------------
+ -- Folding
+--- a/src/Control/Lens/Internal.hs
++++ b/src/Control/Lens/Internal.hs
+@@ -44,6 +44,8 @@
+ import Control.Lens.Internal.Setter
+ import Control.Lens.Internal.Zoom
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
+ #endif
++#endif
+--- a/src/Control/Lens/Iso.hs
++++ b/src/Control/Lens/Iso.hs
+@@ -88,9 +88,11 @@
+ import Data.Profunctor
+ import Data.Profunctor.Unsafe
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use on" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Lens.hs
++++ b/src/Control/Lens/Lens.hs
+@@ -136,9 +136,11 @@
+ import Data.Profunctor.Unsafe
+ import Data.Void
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use ***" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Plated.hs
++++ b/src/Control/Lens/Plated.hs
+@@ -106,9 +106,11 @@
+ import Data.Monoid
+ import Data.Tree
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Reduce duplication" #-}
+ #endif
++#endif
+
+ -- | A 'Plated' type is one where we know how to extract its immediate self-similar children.
+ --
+--- a/src/Control/Lens/Prism.hs
++++ b/src/Control/Lens/Prism.hs
+@@ -59,7 +59,9 @@
+ import Data.Profunctor.Unsafe
+ #endif
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use camelCase" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Setter.hs
++++ b/src/Control/Lens/Setter.hs
+@@ -91,9 +91,11 @@
+ import Data.Profunctor.Rep
+ import Data.Profunctor.Unsafe
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Avoid lambda" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> import Control.Lens
+--- a/src/Control/Monad/Primitive/Lens.hs
++++ b/src/Control/Monad/Primitive/Lens.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE MagicHash #-}
+ {-# LANGUAGE UnboxedTuples #-}
+ {-# LANGUAGE TypeFamilies #-}
+@@ -20,7 +21,9 @@
+ import Control.Monad.Primitive (PrimMonad(..))
+ import GHC.Prim (State#)
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Unused LANGUAGE pragma" #-}
++#endif
+
+ prim :: (PrimMonad m) => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
+ prim = iso internal primitive
+--- a/src/Data/Data/Lens.hs
++++ b/src/Data/Data/Lens.hs
+@@ -65,12 +65,14 @@
+ import Data.Monoid
+ import GHC.Exts (realWorld#)
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Eta reduce" #-}
+ {-# ANN module "HLint: ignore Use foldl" #-}
+ {-# ANN module "HLint: ignore Reduce duplication" #-}
+ {-# ANN module "HLint: ignore Unused LANGUAGE pragma" #-}
+ #endif
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
diff --git a/patches/lens/4.1.2/no-transformers-compat.diff b/patches/lens/4.1.2/no-transformers-compat.diff
new file mode 100644
index 0000000..e72c8cd
--- /dev/null
+++ b/patches/lens/4.1.2/no-transformers-compat.diff
@@ -0,0 +1,10 @@
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -213,7 +213,6 @@
+ template-haskell >= 2.4 && < 2.11,
+ text >= 0.11 && < 1.2,
+ transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 1,
+ unordered-containers >= 0.2 && < 0.3,
+ utf8-string >= 0.3.7 && < 0.4,
+ vector >= 0.9 && < 0.11,
diff --git a/patches/lens/4.1.2/series b/patches/lens/4.1.2/series
new file mode 100644
index 0000000..66cb990
--- /dev/null
+++ b/patches/lens/4.1.2/series
@@ -0,0 +1,5 @@
+add-without-th-flag.patch
+guard-ANNotations.patch
+fix-doctest-path.hs
+fudge-doctest-nonascii.diff
+no-transformers-compat.diff
diff --git a/patches/yesod/1.2.5.2/no-conduit-extra.diff b/patches/yesod/1.2.5.2/no-conduit-extra.diff
new file mode 100644
index 0000000..e7c5e53
--- /dev/null
+++ b/patches/yesod/1.2.5.2/no-conduit-extra.diff
@@ -0,0 +1,10 @@
+--- a/yesod.cabal
++++ b/yesod.cabal
+@@ -48,7 +48,6 @@
+ , bytestring
+ , monad-logger
+ , fast-logger
+- , conduit-extra
+ , shakespeare
+
+ exposed-modules: Yesod
diff --git a/patches/yesod/1.2.5.2/series b/patches/yesod/1.2.5.2/series
new file mode 100644
index 0000000..dda8876
--- /dev/null
+++ b/patches/yesod/1.2.5.2/series
@@ -0,0 +1 @@
+no-conduit-extra.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list