[Pkg-haskell-commits] darcs: haskell-lens: Backport semigroupoids support

[Joachim Breitner]

Mon Sep  8 07:21:00 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Backport semigroupoids support 

    M ./changelog +6
    A ./patches/semigroupoids-4.2
    M ./patches/series +1

Mon Sep  8 07:21:00 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Backport semigroupoids support 
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog	2014-09-08 07:31:17.531326654 +0000
+++ new-haskell-lens/changelog	2014-09-08 07:31:17.543326658 +0000
@@ -1,3 +1,9 @@
+haskell-lens (4.1.2.1-3) UNRELEASED; urgency=medium
+
+  * Backport semigroupoids support 
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 08 Sep 2014 09:19:54 +0200
+
 haskell-lens (4.1.2.1-2) unstable; urgency=medium
 
   * Patch to allow building with QuickCheck-2.7 
diff -rN -u old-haskell-lens/patches/semigroupoids-4.2 new-haskell-lens/patches/semigroupoids-4.2
--- old-haskell-lens/patches/semigroupoids-4.2	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens/patches/semigroupoids-4.2	2014-09-08 07:31:17.539326657 +0000
@@ -0,0 +1,50 @@
+From b569dbd963b4d7bb8f14bc04f6cb72e4bd93227c Mon Sep 17 00:00:00 2001
+From: EdwardKmett <>
+Date: Thu, 31 Jul 2014 03:08:00 +0200
+Subject: version 4.3.3
+
+
+diff --git a/src/Control/Lens/Internal/Instances.hs b/src/Control/Lens/Internal/Instances.hs
+index 16aa51c..b109b1e 100644
+--- a/src/Control/Lens/Internal/Instances.hs
++++ b/src/Control/Lens/Internal/Instances.hs
+@@ -4,6 +4,10 @@
+ #ifndef MIN_VERSION_base
+ #define MIN_VERSION_base(x,y,z) 1
+ #endif
++
++#ifndef MIN_VERSION_semigroupoids
++#define MIN_VERSION_semigroupoids(x,y,z) 1
++#endif
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Control.Lens.Internal.Instances
+@@ -14,14 +18,19 @@
+ -- Portability :  non-portable
+ --
+ -- This module includes orphan instances for @(,)@, 'Either' and 'Const' that
+--- should be supplied by base.
++-- should be supplied by base. These have moved to @semigroupoids@ as of 4.2.
+ ----------------------------------------------------------------------------
+ module Control.Lens.Internal.Instances () where
+ 
++import Data.Traversable.Instances ()
++
++#if !(MIN_VERSION_semigroupoids(0,4,2))
++
+ import Control.Applicative
+ import Data.Semigroup.Foldable
+ import Data.Semigroup.Traversable
+ 
++
+ #if !(MIN_VERSION_base(4,7,0))
+ import Data.Monoid
+ import Data.Foldable
+@@ -60,3 +69,4 @@ instance Foldable1 ((,) b) where
+ instance Traversable1 ((,) b) where
+   traverse1 f (b, a) = (,) b <$> f a
+ 
++#endif
+-- 
+cgit v0.10.2
+
diff -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series	2014-09-08 07:31:17.531326654 +0000
+++ new-haskell-lens/patches/series	2014-09-08 07:31:17.539326657 +0000
@@ -5,3 +5,4 @@
 fudge-doctest-nonascii.diff
 backport-testsuite-failure-fix.patch
 quickcheck-2.7-compat
+semigroupoids-4.2