Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/chasingbottoms/files: chasingbottoms-1.3.0.7-quickcheck-2.7.patch
Date: Wed, 02 Jul 2014 05:58:22
Message-Id: 20140702055817.CE1E22004F@flycatcher.gentoo.org
1 gienah 14/07/02 05:58:17
2
3 Added: chasingbottoms-1.3.0.7-quickcheck-2.7.patch
4 Log:
5 Patch chasingbottoms-1.3.0.7-r3 to allow quickcheck-2.7
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.1 dev-haskell/chasingbottoms/files/chasingbottoms-1.3.0.7-quickcheck-2.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/chasingbottoms/files/chasingbottoms-1.3.0.7-quickcheck-2.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/chasingbottoms/files/chasingbottoms-1.3.0.7-quickcheck-2.7.patch?rev=1.1&content-type=text/plain
14
15 Index: chasingbottoms-1.3.0.7-quickcheck-2.7.patch
16 ===================================================================
17 --- ChasingBottoms-1.3.0.7-orig/ChasingBottoms.cabal 2013-10-15 15:50:33.000000000 +1100
18 +++ ChasingBottoms-1.3.0.7/ChasingBottoms.cabal 2014-07-02 15:23:40.070800449 +1000
19 @@ -121,9 +121,9 @@
20
21 other-modules: Test.ChasingBottoms.IsType
22
23 - build-depends: QuickCheck >= 2.1 && < 2.7,
24 - mtl >= 1.1 && < 2.2,
25 - base >= 4.0 && < 4.8,
26 + build-depends: QuickCheck >= 2.1 && < 2.8,
27 + mtl >= 1.1 && < 2.3,
28 + base >= 4.0,
29 containers >= 0.3 && < 0.6,
30 random == 1.0.*,
31 syb >= 0.1.0.2 && < 0.5
32 @@ -150,9 +150,9 @@
33 Test.ChasingBottoms.TestUtilities.Generators,
34 Test.ChasingBottoms.TimeOut.Tests
35
36 - build-depends: QuickCheck >= 2.1 && < 2.7,
37 - mtl >= 1.1 && < 2.2,
38 - base >= 4.0 && < 4.8,
39 + build-depends: QuickCheck >= 2.1 && < 2.8,
40 + mtl >= 1.1 && < 2.3,
41 + base >= 4.0,
42 containers >= 0.3 && < 0.6,
43 random == 1.0.*,
44 syb >= 0.1.0.2 && < 0.5,
45 --- ChasingBottoms-1.3.0.7-orig/Test/ChasingBottoms/ContinuousFunctions.hs 2013-10-15 15:50:33.000000000 +1100
46 +++ ChasingBottoms-1.3.0.7/Test/ChasingBottoms/ContinuousFunctions.hs 2014-07-02 15:32:00.952887830 +1000
47 @@ -1,4 +1,4 @@
48 -{-# LANGUAGE RankNTypes, ScopedTypeVariables,
49 +{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables,
50 GeneralizedNewtypeDeriving, DeriveDataTypeable #-}
51
52 -- TODO: Can we pattern match on functions?
53 @@ -143,7 +143,12 @@
54 , listOf
55 ) where
56
57 +#if MIN_VERSION_QuickCheck(2,7,0)
58 +import Test.QuickCheck hiding ((><), listOf, infiniteListOf)
59 +import Test.QuickCheck.Gen.Unsafe (promote)
60 +#else
61 import Test.QuickCheck hiding ((><), listOf)
62 +#endif
63 import Data.Sequence as Seq
64 import Data.Foldable as Seq (foldr)
65 import Prelude as P hiding (concat)
66 --- ChasingBottoms-1.3.0.7-orig/Test/ChasingBottoms/TestUtilities/Generators.hs 2013-10-15 15:50:33.000000000 +1100
67 +++ ChasingBottoms-1.3.0.7/Test/ChasingBottoms/TestUtilities/Generators.hs 2014-07-02 15:33:26.677545051 +1000
68 @@ -1,4 +1,4 @@
69 -{-# LANGUAGE RankNTypes, DeriveDataTypeable #-}
70 +{-# LANGUAGE CPP, RankNTypes, DeriveDataTypeable #-}
71
72 -- | Generators that are part of the testing framework.
73
74 @@ -46,7 +46,12 @@
75 import Test.ChasingBottoms.IsBottom
76 import Test.ChasingBottoms.SemanticOrd
77 import Test.ChasingBottoms.TestUtilities
78 +#if MIN_VERSION_QuickCheck(2,7,0)
79 +import Test.QuickCheck hiding (infiniteListOf)
80 +import Test.QuickCheck.Gen.Unsafe (promote)
81 +#else
82 import Test.QuickCheck
83 +#endif
84 import Data.Generics
85 import Control.Monad
86 import Data.Maybe