summaryrefslogtreecommitdiff
path: root/standalone/no-th/haskell-patches/lens_no-TH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'standalone/no-th/haskell-patches/lens_no-TH.patch')
-rw-r--r--standalone/no-th/haskell-patches/lens_no-TH.patch92
1 files changed, 34 insertions, 58 deletions
diff --git a/standalone/no-th/haskell-patches/lens_no-TH.patch b/standalone/no-th/haskell-patches/lens_no-TH.patch
index bc453bfa1..9b15c0448 100644
--- a/standalone/no-th/haskell-patches/lens_no-TH.patch
+++ b/standalone/no-th/haskell-patches/lens_no-TH.patch
@@ -1,20 +1,20 @@
-From 10c9ade98b3ac2054947f411d77db2eb28896b9f Mon Sep 17 00:00:00 2001
+From 88ff2174944daf90530a33ee06e2e3f667089b6a Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
-Date: Thu, 16 Oct 2014 01:43:10 +0000
-Subject: [PATCH] avoid TH
+Date: Fri, 3 Jul 2015 02:06:43 +0000
+Subject: [PATCH] remove TH
---
- lens.cabal | 17 +----------------
- src/Control/Lens.hs | 8 ++------
+ lens.cabal | 16 +---------------
+ src/Control/Lens.hs | 6 ++----
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(+), 30 deletions(-)
+ 7 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/lens.cabal b/lens.cabal
-index 5388301..d7b02b9 100644
+index c7f6009..ab206c5 100644
--- a/lens.cabal
+++ b/lens.cabal
@@ -10,7 +10,7 @@ stability: provisional
@@ -26,15 +26,7 @@ index 5388301..d7b02b9 100644
-- build-tools: cpphs
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
-@@ -217,7 +217,6 @@ library
- Control.Exception.Lens
- Control.Lens
- Control.Lens.Action
-- Control.Lens.At
- Control.Lens.Combinators
- Control.Lens.Cons
- Control.Lens.Each
-@@ -234,8 +233,6 @@ library
+@@ -230,8 +230,6 @@ library
Control.Lens.Internal.Context
Control.Lens.Internal.Deque
Control.Lens.Internal.Exception
@@ -43,7 +35,7 @@ index 5388301..d7b02b9 100644
Control.Lens.Internal.Fold
Control.Lens.Internal.Getter
Control.Lens.Internal.Indexed
-@@ -247,25 +244,21 @@ library
+@@ -243,25 +241,21 @@ library
Control.Lens.Internal.Reflection
Control.Lens.Internal.Review
Control.Lens.Internal.Setter
@@ -69,7 +61,7 @@ index 5388301..d7b02b9 100644
Control.Monad.Primitive.Lens
Control.Parallel.Strategies.Lens
Control.Seq.Lens
-@@ -291,12 +284,8 @@ library
+@@ -287,12 +281,8 @@ library
Data.Typeable.Lens
Data.Vector.Lens
Data.Vector.Generic.Lens
@@ -82,7 +74,7 @@ index 5388301..d7b02b9 100644
Numeric.Lens
other-modules:
-@@ -403,7 +392,6 @@ test-suite doctests
+@@ -395,7 +385,6 @@ test-suite doctests
deepseq,
doctest >= 0.9.1,
filepath,
@@ -90,7 +82,7 @@ index 5388301..d7b02b9 100644
mtl,
nats,
parallel,
-@@ -441,7 +429,6 @@ benchmark plated
+@@ -433,7 +422,6 @@ benchmark plated
comonad,
criterion,
deepseq,
@@ -98,7 +90,7 @@ index 5388301..d7b02b9 100644
lens,
transformers
-@@ -476,7 +463,6 @@ benchmark unsafe
+@@ -468,7 +456,6 @@ benchmark unsafe
comonads-fd,
criterion,
deepseq,
@@ -106,7 +98,7 @@ index 5388301..d7b02b9 100644
lens,
transformers
-@@ -493,6 +479,5 @@ benchmark zipper
+@@ -485,6 +472,5 @@ benchmark zipper
comonads-fd,
criterion,
deepseq,
@@ -114,18 +106,10 @@ index 5388301..d7b02b9 100644
lens,
transformers
diff --git a/src/Control/Lens.hs b/src/Control/Lens.hs
-index 7e15267..433f1fc 100644
+index d879c58..3d6015b 100644
--- a/src/Control/Lens.hs
+++ b/src/Control/Lens.hs
-@@ -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
-@@ -53,12 +52,11 @@ module Control.Lens
+@@ -56,12 +56,11 @@ module Control.Lens
, module Control.Lens.Lens
, module Control.Lens.Level
, module Control.Lens.Loupe
@@ -139,15 +123,7 @@ index 7e15267..433f1fc 100644
, module Control.Lens.TH
#endif
, module Control.Lens.Traversal
-@@ -69,7 +67,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
-@@ -81,12 +78,11 @@ import Control.Lens.Iso
+@@ -83,12 +82,11 @@ import Control.Lens.Iso
import Control.Lens.Lens
import Control.Lens.Level
import Control.Lens.Loupe
@@ -162,12 +138,12 @@ index 7e15267..433f1fc 100644
#endif
import Control.Lens.Traversal
diff --git a/src/Control/Lens/Cons.hs b/src/Control/Lens/Cons.hs
-index a80e9c8..7d27b80 100644
+index 7b35db4..269f307 100644
--- a/src/Control/Lens/Cons.hs
+++ b/src/Control/Lens/Cons.hs
-@@ -55,8 +55,6 @@ import Data.Vector.Unboxed (Unbox)
- import qualified Data.Vector.Unboxed as Unbox
+@@ -56,8 +56,6 @@ import qualified Data.Vector.Unboxed as Unbox
import Data.Word
+ import Prelude
-{-# ANN module "HLint: ignore Eta reduce" #-}
-
@@ -175,12 +151,12 @@ index a80e9c8..7d27b80 100644
-- >>> :set -XNoOverloadedStrings
-- >>> import Control.Lens
diff --git a/src/Control/Lens/Internal/Fold.hs b/src/Control/Lens/Internal/Fold.hs
-index ab09c6b..43aa905 100644
+index 4bbde21..16295f4 100644
--- a/src/Control/Lens/Internal/Fold.hs
+++ b/src/Control/Lens/Internal/Fold.hs
-@@ -37,8 +37,6 @@ import Data.Maybe
- import Data.Semigroup hiding (Min, getMin, Max, getMax)
+@@ -35,8 +35,6 @@ import Data.Semigroup hiding (Min, getMin, Max, getMax)
import Data.Reflection
+ import Prelude
-{-# ANN module "HLint: ignore Avoid lambda" #-}
-
@@ -188,10 +164,10 @@ index ab09c6b..43aa905 100644
-- Folding
------------------------------------------------------------------------------
diff --git a/src/Control/Lens/Operators.hs b/src/Control/Lens/Operators.hs
-index 9992e63..631e8e6 100644
+index 302f68e..1625fe5 100644
--- a/src/Control/Lens/Operators.hs
+++ b/src/Control/Lens/Operators.hs
-@@ -111,7 +111,7 @@ module Control.Lens.Operators
+@@ -104,7 +104,7 @@ module Control.Lens.Operators
, (<#~)
, (<#=)
-- * "Control.Lens.Plated"
@@ -201,12 +177,12 @@ index 9992e63..631e8e6 100644
, ( # )
-- * "Control.Lens.Setter"
diff --git a/src/Control/Lens/Prism.hs b/src/Control/Lens/Prism.hs
-index b75c870..c6c6596 100644
+index 36152d6..3af6bd3 100644
--- a/src/Control/Lens/Prism.hs
+++ b/src/Control/Lens/Prism.hs
-@@ -61,8 +61,6 @@ import Unsafe.Coerce
- import Data.Profunctor.Unsafe
+@@ -62,8 +62,6 @@ import Data.Profunctor.Unsafe
#endif
+ import Prelude
-{-# ANN module "HLint: ignore Use camelCase" #-}
-
@@ -214,17 +190,17 @@ index b75c870..c6c6596 100644
-- >>> :set -XNoOverloadedStrings
-- >>> import Control.Lens
diff --git a/src/Control/Monad/Primitive/Lens.hs b/src/Control/Monad/Primitive/Lens.hs
-index ee942c6..2f37134 100644
+index 8f1ec94..482764a 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(..))
+@@ -26,7 +26,6 @@ import Control.Lens
+ import Control.Monad.Primitive
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
+ #if MIN_VERSION_primitive(0,6,0)
+ prim :: PrimBase m => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
--
-2.1.1
+2.1.4