[Pkg-haskell-commits] [package-plan] 271/457: Import some patches
Joachim Breitner
nomeata at moszumanska.debian.org
Mon Apr 14 20:05:36 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 6ed70b8656d623fe734bf2e02a2924a64e5529fe
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sat Nov 30 23:41:11 2013 +0000
Import some patches
---
patches/lens/3.10/add-without-th-flag.patch | 124 +++++++++++++
.../3.10/fix-doctest-float-implementations.diff | 20 ++
patches/lens/3.10/fix-doctest-path.hs | 16 ++
patches/lens/3.10/fudge-doctest-nonascii.diff | 31 ++++
patches/lens/3.10/guard-ANNotations.patch | 201 +++++++++++++++++++++
patches/lens/3.10/no-transformers-compat.diff | 12 ++
patches/lens/3.10/series | 6 +
.../3.2.0.2/cohoist-fix.diff | 13 ++
patches/representable-functors/3.2.0.2/series | 2 +
.../3.2.0.2/tweak-build-deps.diff | 25 +++
10 files changed, 450 insertions(+)
diff --git a/patches/lens/3.10/add-without-th-flag.patch b/patches/lens/3.10/add-without-th-flag.patch
new file mode 100644
index 0000000..f22e71c
--- /dev/null
+++ b/patches/lens/3.10/add-without-th-flag.patch
@@ -0,0 +1,124 @@
+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
+Subject: [PATCH 2/3] add without-th flag
+
+---
+ lens.cabal | 28 +++++++++++++++++++++-------
+ src/Control/Lens/Internal/Exception.hs | 6 ++++++
+ 2 files changed, 27 insertions(+), 7 deletions(-)
+
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -133,6 +133,11 @@
+ default: False
+ manual: True
+
++-- Avoid bulding modules that need TH
++flag without-th
++ default: False
++ manual: True
++
+ -- You can disable the doctests test suite with -f-test-doctests
+ flag test-doctests
+ default: True
+@@ -173,14 +178,12 @@
+ containers >= 0.4.0 && < 0.6,
+ distributive >= 0.3 && < 1,
+ filepath >= 1.2.0.0 && < 1.4,
+- generic-deriving >= 1.4 && < 1.7,
+ ghc-prim,
+ hashable >= 1.1.2.3 && < 1.3,
+ MonadCatchIO-transformers >= 0.3 && < 0.4,
+ mtl >= 2.0.1 && < 2.2,
+ parallel >= 3.1.0.1 && < 3.3,
+ profunctors >= 4 && < 5,
+- reflection >= 1.1.6 && < 2,
+ semigroupoids >= 4 && < 5,
+ semigroups >= 0.8.4 && < 1,
+ split >= 0.2 && < 0.3,
+@@ -235,7 +238,6 @@
+ Control.Lens.Review
+ Control.Lens.Setter
+ Control.Lens.Simple
+- Control.Lens.TH
+ Control.Lens.Traversal
+ Control.Lens.Tuple
+ Control.Lens.Type
+@@ -266,14 +268,23 @@
+ 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
+
++ if flag(without-th)
++ cpp-options: -DDISABLE_TEMPLATE_HASKELL
++ else
++ build-depends:
++ generic-deriving >= 1.4 && < 1.6,
++ reflection >= 1.1.6 && < 2
++ exposed-modules:
++ Control.Lens.TH
++ Language.Haskell.TH.Lens
++ Generics.Deriving.Lens
++ GHC.Generics.Lens
++ System.IO.Error.Lens
++
+ if flag(safe)
+ cpp-options: -DSAFE=1
+
+@@ -306,6 +317,9 @@
+ build-depends: base, lens
+ 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
+@@ -34,7 +34,9 @@
+ import Data.IORef
+ import Data.Monoid
+ import Data.Proxy
++#ifndef DISABLE_TEMPLATE_HASKELL
+ import Data.Reflection
++#endif
+ import Data.Typeable
+ import System.IO.Unsafe
+
+@@ -128,6 +130,7 @@
+ handler_ l = handler l . const
+ {-# INLINE handler_ #-}
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ instance Handleable SomeException IO Exception.Handler where
+ handler = handlerIO
+
+@@ -139,6 +142,7 @@
+
+ handlerCatchIO :: forall m a r. Getting (First a) SomeException a -> (a -> m r) -> CatchIO.Handler m r
+ handlerCatchIO l f = reify (preview l) $ \ (_ :: Proxy s) -> CatchIO.Handler (\(Handling a :: Handling a s m) -> f a)
++#endif
+
+ ------------------------------------------------------------------------------
+ -- Helpers
+@@ -172,8 +176,10 @@
+ showsPrec d _ = showParen (d > 10) $ showString "Handling ..."
+ {-# INLINE showsPrec #-}
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ 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 #-}
++#endif
diff --git a/patches/lens/3.10/fix-doctest-float-implementations.diff b/patches/lens/3.10/fix-doctest-float-implementations.diff
new file mode 100644
index 0000000..d55e275
--- /dev/null
+++ b/patches/lens/3.10/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/3.10/fix-doctest-path.hs b/patches/lens/3.10/fix-doctest-path.hs
new file mode 100644
index 0000000..4621819
--- /dev/null
+++ b/patches/lens/3.10/fix-doctest-path.hs
@@ -0,0 +1,16 @@
+Index: haskell-lens-3.9.0.2/tests/doctests.hsc
+===================================================================
+--- haskell-lens-3.9.0.2.orig/tests/doctests.hsc 2013-06-15 13:40:30.329035355 +0200
++++ haskell-lens-3.9.0.2/tests/doctests.hsc 2013-06-15 13:40:30.325035355 +0200
+@@ -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/3.10/fudge-doctest-nonascii.diff b/patches/lens/3.10/fudge-doctest-nonascii.diff
new file mode 100644
index 0000000..c1e69ee
--- /dev/null
+++ b/patches/lens/3.10/fudge-doctest-nonascii.diff
@@ -0,0 +1,31 @@
+Index: lens-3.9.0.2/src/Data/Complex/Lens.hs
+===================================================================
+--- lens-3.9.0.2.orig/src/Data/Complex/Lens.hs 2013-03-27 14:48:23.000000000 +0000
++++ lens-3.9.0.2/src/Data/Complex/Lens.hs 2013-04-02 01:54:13.162989222 +0000
+@@ -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/3.10/guard-ANNotations.patch b/patches/lens/3.10/guard-ANNotations.patch
new file mode 100644
index 0000000..914b7cf
--- /dev/null
+++ b/patches/lens/3.10/guard-ANNotations.patch
@@ -0,0 +1,201 @@
+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
+Subject: [PATCH 3/3] guard ANNotations
+
+---
+ src/Control/Exception/Lens.hs | 2 ++
+ src/Control/Lens.hs | 2 ++
+ src/Control/Lens/Equality.hs | 3 +++
+ src/Control/Lens/Fold.hs | 2 ++
+ src/Control/Lens/Internal.hs | 3 +++
+ src/Control/Lens/Internal/Zipper.hs | 2 ++
+ src/Control/Lens/Iso.hs | 2 ++
+ src/Control/Lens/Lens.hs | 2 ++
+ src/Control/Lens/Operators.hs | 3 +++
+ src/Control/Lens/Plated.hs | 2 ++
+ src/Control/Lens/Prism.hs | 2 ++
+ src/Control/Lens/Setter.hs | 2 ++
+ src/Control/Lens/TH.hs | 2 ++
+ src/Data/Data/Lens.hs | 2 ++
+ 14 files changed, 31 insertions(+)
+
+--- a/src/Control/Exception/Lens.hs
++++ b/src/Control/Exception/Lens.hs
+@@ -112,7 +112,9 @@
+ , Maybe(..), Either(..), Functor(..), String, IO
+ )
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use Control.Exception.catch" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens.hs
++++ b/src/Control/Lens.hs
+@@ -99,4 +99,6 @@
+ import Control.Lens.Zipper
+ import Control.Lens.Zoom
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
++#endif
+--- a/src/Control/Lens/Equality.hs
++++ b/src/Control/Lens/Equality.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE GADTs #-}
+ {-# LANGUAGE Rank2Types #-}
+ {-# LANGUAGE TypeFamilies #-}
+@@ -28,8 +29,10 @@
+ import Control.Lens.Internal.Setter
+ import Control.Lens.Type
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use id" #-}
+ {-# ANN module "HLint: ignore Eta reduce" #-}
++#endif
+
+ -- $setup
+ -- >>> import Control.Lens
+--- a/src/Control/Lens/Fold.hs
++++ b/src/Control/Lens/Fold.hs
+@@ -163,9 +163,11 @@
+ -- >>> 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
+ {-# ANN module "HLint: ignore Eta reduce" #-}
+ {-# ANN module "HLint: ignore Use camelCase" #-}
+ {-# ANN module "HLint: ignore Use curry" #-}
++#endif
+
+ infixl 8 ^.., ^?, ^?!, ^@.., ^@?, ^@?!
+
+--- a/src/Control/Lens/Internal.hs
++++ b/src/Control/Lens/Internal.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Control.Lens.Internal
+@@ -43,4 +44,6 @@
+ import Control.Lens.Internal.Setter
+ import Control.Lens.Internal.Zoom
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
++#endif
+--- a/src/Control/Lens/Internal/Zipper.hs
++++ b/src/Control/Lens/Internal/Zipper.hs
+@@ -53,7 +53,9 @@
+ -- >>> import Control.Lens
+ -- >>> import Data.Char
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use foldl" #-}
++#endif
+
+ ------------------------------------------------------------------------------
+ -- * Jacket
+--- a/src/Control/Lens/Iso.hs
++++ b/src/Control/Lens/Iso.hs
+@@ -82,7 +82,9 @@
+ import Data.Profunctor
+ import Data.Profunctor.Unsafe
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use on" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Lens.hs
++++ b/src/Control/Lens/Lens.hs
+@@ -126,7 +126,9 @@
+ import Data.Profunctor.Unsafe
+ import Data.Void
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use ***" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Operators.hs
++++ b/src/Control/Lens/Operators.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Control.Lens.Operators
+@@ -108,4 +109,6 @@
+ import Control.Lens.Setter
+ import Control.Lens.Zipper
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
++#endif
+--- a/src/Control/Lens/Plated.hs
++++ b/src/Control/Lens/Plated.hs
+@@ -95,7 +95,9 @@
+ import Data.Monoid
+ import Data.Tree
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Reduce duplication" #-}
++#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
+@@ -53,7 +53,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
+@@ -87,7 +87,9 @@
+ import Data.Profunctor.Rep
+ import Data.Profunctor.Unsafe
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Avoid lambda" #-}
++#endif
+
+ -- $setup
+ -- >>> import Control.Lens
+--- a/src/Control/Lens/TH.hs
++++ b/src/Control/Lens/TH.hs
+@@ -87,7 +87,9 @@
+ import Language.Haskell.TH.Syntax
+ import Language.Haskell.TH.Lens
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Use foldl" #-}
++#endif
+
+ -- | Flags for 'Lens' construction
+ data LensFlag
+--- a/src/Data/Data/Lens.hs
++++ b/src/Data/Data/Lens.hs
+@@ -65,9 +65,11 @@
+ import GHC.Exts (realWorld#)
+ #endif
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Eta reduce" #-}
+ {-# ANN module "HLint: ignore Use foldl" #-}
+ {-# ANN module "HLint: ignore Reduce duplication" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
diff --git a/patches/lens/3.10/no-transformers-compat.diff b/patches/lens/3.10/no-transformers-compat.diff
new file mode 100644
index 0000000..138a3c5
--- /dev/null
+++ b/patches/lens/3.10/no-transformers-compat.diff
@@ -0,0 +1,12 @@
+Index: haskell-lens-3.9.0.2/lens.cabal
+===================================================================
+--- haskell-lens-3.9.0.2.orig/lens.cabal 2013-06-15 13:44:08.673027452 +0200
++++ haskell-lens-3.9.0.2/lens.cabal 2013-06-15 13:44:08.669027452 +0200
+@@ -191,7 +191,6 @@
+ template-haskell >= 2.4 && < 2.10,
+ text >= 0.11 && < 0.12,
+ transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 1,
+ unordered-containers >= 0.2 && < 0.3,
+ vector >= 0.9 && < 0.11,
+ void >= 0.5 && < 1
diff --git a/patches/lens/3.10/series b/patches/lens/3.10/series
new file mode 100644
index 0000000..e9e4a1d
--- /dev/null
+++ b/patches/lens/3.10/series
@@ -0,0 +1,6 @@
+add-without-th-flag.patch
+guard-ANNotations.patch
+fix-doctest-path.hs
+fudge-doctest-nonascii.diff
+no-transformers-compat.diff
+fix-doctest-float-implementations.diff
diff --git a/patches/representable-functors/3.2.0.2/cohoist-fix.diff b/patches/representable-functors/3.2.0.2/cohoist-fix.diff
new file mode 100644
index 0000000..7c2723b
--- /dev/null
+++ b/patches/representable-functors/3.2.0.2/cohoist-fix.diff
@@ -0,0 +1,13 @@
+Index: representable-functors-3.2.0.2/src/Control/Comonad/Representable/Store.hs
+===================================================================
+--- representable-functors-3.2.0.2.orig/src/Control/Comonad/Representable/Store.hs 2013-10-13 11:01:56.000000000 -0400
++++ representable-functors-3.2.0.2/src/Control/Comonad/Representable/Store.hs 2013-11-30 13:00:55.910979199 -0500
+@@ -109,7 +109,7 @@
+ lower (StoreT w s) = fmap (`index` s) w
+
+ instance ComonadHoist (StoreT g) where
+- cohoist (StoreT w s) = StoreT (Identity (extract w)) s
++ cohoist l (StoreT w s) = StoreT (l w) s
+
+ instance (ComonadTraced m w, Representable g) => ComonadTraced m (StoreT g w) where
+ trace m = trace m . lower
diff --git a/patches/representable-functors/3.2.0.2/series b/patches/representable-functors/3.2.0.2/series
new file mode 100644
index 0000000..98d9f14
--- /dev/null
+++ b/patches/representable-functors/3.2.0.2/series
@@ -0,0 +1,2 @@
+tweak-build-deps.diff
+cohoist-fix.diff
diff --git a/patches/representable-functors/3.2.0.2/tweak-build-deps.diff b/patches/representable-functors/3.2.0.2/tweak-build-deps.diff
new file mode 100644
index 0000000..5d5b491
--- /dev/null
+++ b/patches/representable-functors/3.2.0.2/tweak-build-deps.diff
@@ -0,0 +1,25 @@
+Index: representable-functors-3.2.0.2/representable-functors.cabal
+===================================================================
+--- representable-functors-3.2.0.2.orig/representable-functors.cabal 2013-10-13 11:01:56.000000000 -0400
++++ representable-functors-3.2.0.2/representable-functors.cabal 2013-11-30 12:56:11.452049007 -0500
+@@ -42,17 +42,15 @@
+ build-depends:
+ array >= 0.3.0.2 && < 0.6,
+ base >= 4 && < 5,
+- comonad >= 3 && < 4,
+- comonad-transformers >= 3 && < 4,
+- comonads-fd >= 3 && < 4,
++ comonad >= 4 && < 5,
+ containers >= 0.3 && < 0.6,
+ contravariant >= 0.4.1 && < 1,
+ distributive >= 0.2.2 && < 1,
+- free >= 3 && < 4,
++ free >= 3 && < 5,
+ keys >= 3 && < 4,
+ mtl >= 2.0.1.0 && < 2.2,
+ semigroups >= 0.8.3.1 && < 1,
+- semigroupoids >= 3 && < 4,
++ semigroupoids >= 3 && < 5,
+ transformers >= 0.2 && < 0.4
+
+ exposed-modules:
--
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