[Pkg-haskell-commits] darcs: haskell-lens: Patch to allow building with QuickCheck-2.7

[Joachim Breitner]

Sat Aug  2 09:23:14 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Patch to allow building with QuickCheck-2.7 

    M ./changelog +6
    A ./patches/quickcheck-2.7-compat
    M ./patches/series +1

Sat Aug  2 09:23:14 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Patch to allow building with QuickCheck-2.7 
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog	2014-08-02 09:43:07.523293222 +0000
+++ new-haskell-lens/changelog	2014-08-02 09:43:07.535293225 +0000
@@ -1,3 +1,9 @@
+haskell-lens (4.1.2.1-2) UNRELEASED; urgency=medium
+
+  * Patch to allow building with QuickCheck-2.7 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 02 Aug 2014 11:13:59 +0200
+
 haskell-lens (4.1.2.1-1) unstable; urgency=medium
 
   * New upstream release
diff -rN -u old-haskell-lens/patches/quickcheck-2.7-compat new-haskell-lens/patches/quickcheck-2.7-compat
--- old-haskell-lens/patches/quickcheck-2.7-compat	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens/patches/quickcheck-2.7-compat	2014-08-02 09:43:07.531293224 +0000
@@ -0,0 +1,37 @@
+Index: haskell-lens-4.1.2.1/lens-properties/src/Control/Lens/Properties.hs
+===================================================================
+--- haskell-lens-4.1.2.1.orig/lens-properties/src/Control/Lens/Properties.hs	2014-05-16 19:17:35.000000000 +0200
++++ haskell-lens-4.1.2.1/lens-properties/src/Control/Lens/Properties.hs	2014-08-02 11:13:41.898140422 +0200
+@@ -44,8 +44,8 @@
+                   .&. do as <- arbitrary
+                          bs <- arbitrary
+                          t <- arbitrary
+-                         property $ traverse_compose l (\x -> as++[x]++bs)
+-                                                       (\x -> if t then Just x else Nothing)
++                         return $ traverse_compose l (\x -> as++[x]++bs)
++                                                     (\x -> if t then Just x else Nothing)
+ 
+ 
+ --------------------------------------------------------------------------------
+Index: haskell-lens-4.1.2.1/src/Data/Aeson/Lens.hs
+===================================================================
+--- haskell-lens-4.1.2.1.orig/src/Data/Aeson/Lens.hs	2014-08-02 11:22:48.690121006 +0200
++++ haskell-lens-4.1.2.1/src/Data/Aeson/Lens.hs	2014-08-02 11:22:59.310120629 +0200
+@@ -215,7 +215,7 @@
+ -- Just (String "xyz")
+ --
+ -- >>> "{\"a\": {}, \"b\": null}" ^? key "a" . nonNull
+--- Just (Object fromList [])
++-- Just (Object (fromList []))
+ --
+ -- >>> "{\"a\": \"xyz\", \"b\": null}" ^? key "b" . nonNull
+ -- Nothing
+@@ -235,7 +235,7 @@
+ 
+   -- |
+   -- >>> "{\"a\": {}, \"b\": null}" ^? key "a" . _Object
+-  -- Just fromList []
++  -- Just (fromList [])
+   --
+   -- >>> "{\"a\": {}, \"b\": null}" ^? key "b" . _Object
+   -- Nothing
diff -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series	2014-08-02 09:43:07.519293221 +0000
+++ new-haskell-lens/patches/series	2014-08-02 09:43:07.531293224 +0000
@@ -4,3 +4,4 @@
 fix-doctest-path.hs
 fudge-doctest-nonascii.diff
 backport-testsuite-failure-fix.patch
+quickcheck-2.7-compat