[Pkg-haskell-commits] darcs: haskell-lens: Update patches
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 22 14:30:02 UTC 2014
Sun Dec 21 23:27:17 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update patches
R ./patches/add-without-th-flag.patch
R ./patches/backport-testsuite-failure-fix.patch
M ./patches/fudge-doctest-nonascii.diff -2 +4
R ./patches/guard-ANNotations.patch
R ./patches/no-transformers-compat.diff
M ./patches/series -4
Sun Dec 21 23:27:17 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update patches
diff -rN -u old-haskell-lens/patches/add-without-th-flag.patch new-haskell-lens/patches/add-without-th-flag.patch
--- old-haskell-lens/patches/add-without-th-flag.patch 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/add-without-th-flag.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-Index: haskell-lens-4.1.2/lens.cabal
-===================================================================
---- haskell-lens-4.1.2.orig/lens.cabal 2014-05-13 17:29:11.000000000 +0200
-+++ haskell-lens-4.1.2/lens.cabal 2014-05-13 17:34:06.731912080 +0200
-@@ -121,6 +121,12 @@
- default: False
- manual: True
-
-+-- Avoid bulding modules that need TH
-+flag without-th
-+ default: False
-+ manual: True
-+
-+
- -- Generate inline pragmas when using template-haskell. This defaults to enabled, but you can
- --
- -- > cabal install lens -f-inlining
-@@ -248,7 +254,6 @@
- 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
-@@ -260,7 +265,6 @@
- Control.Lens.Reified
- Control.Lens.Review
- Control.Lens.Setter
-- Control.Lens.TH
- Control.Lens.Traversal
- Control.Lens.Tuple
- Control.Lens.Type
-@@ -301,11 +305,18 @@
- Language.Haskell.TH.Lens
- Numeric.Lens
-
-- other-modules:
-- Control.Lens.Internal.TupleIxedTH
-
- cpp-options: -traditional
-
-+ if flag(without-th)
-+ cpp-options: -DDISABLE_TEMPLATE_HASKELL
-+ else
-+ exposed-modules:
-+ Control.Lens.TH
-+ Control.Lens.Internal.TH
-+ other-modules:
-+ Control.Lens.Internal.TupleIxedTH
-+
- if flag(safe)
- cpp-options: -DSAFE=1
-
-@@ -339,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
-
-Index: haskell-lens-4.1.2/src/Control/Lens/At.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/At.hs 2014-05-13 17:28:14.000000000 +0200
-+++ haskell-lens-4.1.2/src/Control/Lens/At.hs 2014-05-13 17:29:11.000000000 +0200
-@@ -2,7 +2,9 @@
- {-# LANGUAGE GADTs #-}
- {-# LANGUAGE Rank2Types #-}
- {-# LANGUAGE TypeFamilies #-}
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# LANGUAGE TemplateHaskell #-}
-+#endif
- {-# LANGUAGE FlexibleContexts #-}
- {-# LANGUAGE DefaultSignatures #-}
- {-# LANGUAGE FlexibleInstances #-}
-@@ -45,7 +47,9 @@
- import Control.Lens.Lens
- import Control.Lens.Setter
- import Control.Lens.Type
-+#ifndef DISABLE_TEMPLATE_HASKELL
- import Control.Lens.Internal.TupleIxedTH (makeAllTupleIxed)
-+#endif
- import Data.Aeson as Aeson
- import Data.Array.IArray as Array
- import Data.Array.Unboxed
-@@ -441,4 +445,6 @@
- where mv = if HashSet.member k m then Just () else Nothing
- {-# INLINE at #-}
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- makeAllTupleIxed
-+#endif
-Index: haskell-lens-4.1.2/src/System/IO/Error/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/System/IO/Error/Lens.hs 2014-05-13 17:28:14.000000000 +0200
-+++ haskell-lens-4.1.2/src/System/IO/Error/Lens.hs 2014-05-13 17:29:11.000000000 +0200
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
- {-# LANGUAGE FlexibleContexts #-}
- {-# LANGUAGE FlexibleInstances #-}
-@@ -62,4 +63,6 @@
- --
- -- (These prisms are generated automatically)
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- makePrisms ''IOErrorType
-+#endif
diff -rN -u old-haskell-lens/patches/backport-testsuite-failure-fix.patch new-haskell-lens/patches/backport-testsuite-failure-fix.patch
--- old-haskell-lens/patches/backport-testsuite-failure-fix.patch 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/backport-testsuite-failure-fix.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-Description: Fix testsuite failure on some archs
- Upstream tried to fix this on https://github.com/ekmett/lens/commit/1a59eb2fc012549dc922596d48db88bbc611b561
- but it still did not work on all arches, so we simply drop the check for now.
-Index: haskell-lens-4.1.2/src/Numeric/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Numeric/Lens.hs 2014-05-15 09:32:52.456506391 +0200
-+++ haskell-lens-4.1.2/src/Numeric/Lens.hs 2014-05-15 09:33:17.044505416 +0200
-@@ -159,8 +159,6 @@
- --
- -- Note: This errors for n = 0
- --
---- >>> au (exponentiating 2._Unwrapping Sum) (foldMapOf each) (3,4)
---- 5.0
- exponentiating :: (Floating a, Eq a) => a -> Iso' a a
- exponentiating 0 = error "Numeric.Lens.exponentiating: exponent 0"
- exponentiating n = iso (**n) (**recip n)
diff -rN -u old-haskell-lens/patches/fudge-doctest-nonascii.diff new-haskell-lens/patches/fudge-doctest-nonascii.diff
--- old-haskell-lens/patches/fudge-doctest-nonascii.diff 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/fudge-doctest-nonascii.diff 2014-12-22 14:30:02.393348970 +0000
@@ -1,5 +1,7 @@
---- a/src/Data/Complex/Lens.hs
-+++ b/src/Data/Complex/Lens.hs
+Index: lens-4.6.0.1/src/Data/Complex/Lens.hs
+===================================================================
+--- lens-4.6.0.1.orig/src/Data/Complex/Lens.hs 2014-12-22 00:17:16.254766098 +0100
++++ lens-4.6.0.1/src/Data/Complex/Lens.hs 2014-12-22 00:17:16.250766018 +0100
@@ -30,7 +30,7 @@
-- $setup
diff -rN -u old-haskell-lens/patches/guard-ANNotations.patch new-haskell-lens/patches/guard-ANNotations.patch
--- old-haskell-lens/patches/guard-ANNotations.patch 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/guard-ANNotations.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,247 +0,0 @@
-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
-Index: haskell-lens-4.1.2/src/Control/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens.hs
-+++ haskell-lens-4.1.2/src/Control/Lens.hs
-@@ -95,6 +95,8 @@ import Control.Lens.Type
- import Control.Lens.Wrapped
- import Control.Lens.Zoom
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- #ifdef HLINT
- {-# ANN module "HLint: ignore Use import/export shortcut" #-}
- #endif
-+#endif
-Index: haskell-lens-4.1.2/src/Control/Lens/Equality.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Equality.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Equality.hs
-@@ -31,10 +31,12 @@ module Control.Lens.Equality
- 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 @@ simply = id
- -- 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 #-}
-Index: haskell-lens-4.1.2/src/Control/Lens/Fold.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Fold.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Fold.hs
-@@ -178,11 +178,13 @@ import Data.Traversable
- -- >>> 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 ^.., ^?, ^?!, ^@.., ^@?, ^@?!
-
-Index: haskell-lens-4.1.2/src/Control/Exception/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Exception/Lens.hs
-+++ haskell-lens-4.1.2/src/Control/Exception/Lens.hs
-@@ -119,9 +119,11 @@ import Prelude
- , Maybe(..), Either(..), String
- )
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- #ifdef HLINT
- {-# ANN module "HLint: ignore Use Control.Exception.catch" #-}
- #endif
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
-Index: haskell-lens-4.1.2/src/Control/Lens/Cons.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Cons.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Cons.hs
-@@ -55,7 +55,9 @@ import Data.Vector.Unboxed (Un
- import qualified Data.Vector.Unboxed as Unbox
- import Data.Word
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Eta reduce" #-}
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
-Index: haskell-lens-4.1.2/src/Control/Lens/Internal/Fold.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Internal/Fold.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Internal/Fold.hs
-@@ -37,7 +37,9 @@ import Data.Maybe
- import Data.Semigroup hiding (Min, getMin, Max, getMax)
- import Data.Reflection
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Avoid lambda" #-}
-+#endif
-
- ------------------------------------------------------------------------------
- -- Folding
-Index: haskell-lens-4.1.2/src/Control/Lens/Internal.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Internal.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Internal.hs
-@@ -44,6 +44,8 @@ import Control.Lens.Internal.Review
- 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
-Index: haskell-lens-4.1.2/src/Control/Lens/Iso.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Iso.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Iso.hs
-@@ -88,9 +88,11 @@ import Data.Maybe
- import Data.Profunctor
- import Data.Profunctor.Unsafe
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- #ifdef HLINT
- {-# ANN module "HLint: ignore Use on" #-}
- #endif
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
-Index: haskell-lens-4.1.2/src/Control/Lens/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Lens.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Lens.hs
-@@ -136,9 +136,11 @@ import Data.Profunctor.Rep
- import Data.Profunctor.Unsafe
- import Data.Void
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- #ifdef HLINT
- {-# ANN module "HLint: ignore Use ***" #-}
- #endif
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
-Index: haskell-lens-4.1.2/src/Control/Lens/Plated.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Plated.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Plated.hs
-@@ -106,9 +106,11 @@ import Data.Data.Lens
- 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.
- --
-Index: haskell-lens-4.1.2/src/Control/Lens/Prism.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Prism.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Prism.hs
-@@ -59,7 +59,9 @@ import Unsafe.Coerce
- import Data.Profunctor.Unsafe
- #endif
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use camelCase" #-}
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
-Index: haskell-lens-4.1.2/src/Control/Lens/Setter.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Setter.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Setter.hs
-@@ -91,9 +91,11 @@ import Data.Profunctor
- 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
-Index: haskell-lens-4.1.2/src/Control/Monad/Primitive/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Monad/Primitive/Lens.hs
-+++ haskell-lens-4.1.2/src/Control/Monad/Primitive/Lens.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE MagicHash #-}
- {-# LANGUAGE UnboxedTuples #-}
- {-# LANGUAGE TypeFamilies #-}
-@@ -20,7 +21,9 @@ import Control.Lens
- 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
-Index: haskell-lens-4.1.2/src/Data/Data/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Data/Data/Lens.hs
-+++ haskell-lens-4.1.2/src/Data/Data/Lens.hs
-@@ -65,12 +65,14 @@ import Data.IORef
- 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
-Index: haskell-lens-4.1.2/src/Control/Lens/Internal/Reflection.hs
-===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/Internal/Reflection.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/Internal/Reflection.hs
-@@ -64,7 +64,9 @@ import Data.Word
- import Data.Typeable
- import Data.Reflection
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Avoid lambda" #-}
-+#endif
-
- class Typeable s => B s where
- reflectByte :: proxy s -> IntPtr
diff -rN -u old-haskell-lens/patches/no-transformers-compat.diff new-haskell-lens/patches/no-transformers-compat.diff
--- old-haskell-lens/patches/no-transformers-compat.diff 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/no-transformers-compat.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Index: haskell-lens-4.1.2/lens.cabal
-===================================================================
---- haskell-lens-4.1.2.orig/lens.cabal
-+++ haskell-lens-4.1.2/lens.cabal
-@@ -209,7 +209,6 @@ library
- 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 -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series 2014-12-22 14:30:02.389348966 +0000
+++ new-haskell-lens/patches/series 2014-12-22 14:30:02.393348970 +0000
@@ -1,6 +1,2 @@
-no-transformers-compat.diff
-add-without-th-flag.patch
-guard-ANNotations.patch
fix-doctest-path.hs
fudge-doctest-nonascii.diff
-backport-testsuite-failure-fix.patch
More information about the Pkg-haskell-commits
mailing list