git.iko.soy/stackage
on master help sign in
Add patches, remove upper bounds, and close #199
commit2e583a9ebd56a6b0997a3165aa61deea8ad4cac4 authorMichael Snoyman <michael@snoyman.com> dateTue 10 Jun 2014, 13:10 (12 years ago) parentd5bac2d
4 files changed+111−4
compare with master
unifiedsplit
Stackage/Config.hs−4 patching/patches/ChasingBottoms-1.3.0.7.patch+34 patching/patches/checkers-0.3.2.patch+65 patching/patches/uuid-1.3.3.patch+12
Stackage/Config.hs−4
@@ -399,10 +399,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
399399 when (ghcVer == GhcMajorVersion 7 6 && requireHP) $
400400 addRange "Michael Snoyman" "parsers" "< 0.11"
401401
402− -- https://github.com/fpco/stackage/issues/199
403− addRange "Michael Snoyman" "QuickCheck" "< 2.7"
404− addRange "Michael Snoyman" "tasty-quickcheck" "< 0.8.0.3"
405−
406402 -- https://github.com/fpco/stackage/issues/216
407403 when (ghcVer == GhcMajorVersion 7 6) $
408404 addRange "Michael Snoyman" "repa" "< 3.2.5.1"
patching/patches/ChasingBottoms-1.3.0.7.patchnew file+34
@@ -0,0 +1,34 @@
1+diff -ru orig/ChasingBottoms.cabal new/ChasingBottoms.cabal
2+--- orig/ChasingBottoms.cabal 2014-06-10 13:09:03.210534172 +0300
3++++ new/ChasingBottoms.cabal 2014-06-10 13:09:03.000000000 +0300
4+@@ -121,7 +121,7 @@
5+
6+ other-modules: Test.ChasingBottoms.IsType
7+
8+- build-depends: QuickCheck >= 2.1 && < 2.7,
9++ build-depends: QuickCheck >= 2.1 && < 2.8,
10+ mtl >= 1.1 && < 2.2,
11+ base >= 4.0 && < 4.8,
12+ containers >= 0.3 && < 0.6,
13+@@ -150,7 +150,7 @@
14+ Test.ChasingBottoms.TestUtilities.Generators,
15+ Test.ChasingBottoms.TimeOut.Tests
16+
17+- build-depends: QuickCheck >= 2.1 && < 2.7,
18++ build-depends: QuickCheck >= 2.1 && < 2.8,
19+ mtl >= 1.1 && < 2.2,
20+ base >= 4.0 && < 4.8,
21+ containers >= 0.3 && < 0.6,
22+diff -ru orig/Test/ChasingBottoms/ContinuousFunctions.hs new/Test/ChasingBottoms/ContinuousFunctions.hs
23+--- orig/Test/ChasingBottoms/ContinuousFunctions.hs 2014-06-10 13:09:03.202534172 +0300
24++++ new/Test/ChasingBottoms/ContinuousFunctions.hs 2014-06-10 13:09:03.000000000 +0300
25+@@ -143,7 +143,8 @@
26+ , listOf
27+ ) where
28+
29+-import Test.QuickCheck hiding ((><), listOf)
30++import Test.QuickCheck hiding ((><), listOf, infiniteListOf)
31++import Test.QuickCheck.Gen.Unsafe (promote)
32+ import Data.Sequence as Seq
33+ import Data.Foldable as Seq (foldr)
34+ import Prelude as P hiding (concat)
patching/patches/checkers-0.3.2.patchnew file+65
@@ -0,0 +1,65 @@
1+diff -ru orig/checkers.cabal new/checkers.cabal
2+--- orig/checkers.cabal 2014-06-10 13:09:03.522534168 +0300
3++++ new/checkers.cabal 2014-06-10 13:09:03.000000000 +0300
4+@@ -27,7 +27,7 @@
5+ Library
6+ hs-Source-Dirs: src
7+ Extensions:
8+- Build-Depends: base < 5, random, QuickCheck>=2.3 && <2.7, array >= 0.1
9++ Build-Depends: base < 5, random, QuickCheck>=2.3 && <2.8, array >= 0.1
10+ Exposed-Modules:
11+ Test.QuickCheck.Utils
12+ Test.QuickCheck.Checkers
13+diff -ru orig/src/Test/QuickCheck/Checkers.hs new/src/Test/QuickCheck/Checkers.hs
14+--- orig/src/Test/QuickCheck/Checkers.hs 2014-06-10 13:09:03.518534168 +0300
15++++ new/src/Test/QuickCheck/Checkers.hs 2014-06-10 13:09:03.000000000 +0300
16+@@ -51,7 +51,8 @@
17+ import qualified Control.Exception as Ex
18+ import Data.List (foldl')
19+ import System.Random
20+-import Test.QuickCheck
21++import Test.QuickCheck hiding (generate)
22++import Test.QuickCheck.Random (QCGen, newQCGen)
23+ -- import System.IO.Unsafe
24+
25+ import Test.QuickCheck.Gen (Gen (..)) -- for rand
26+@@ -442,12 +443,12 @@
27+
28+ -- | Generate n arbitrary values
29+ arbs :: Arbitrary a => Int -> IO [a]
30+-arbs n = fmap (\ rnd -> generate n rnd (vector n)) newStdGen
31++arbs n = fmap (\ rnd -> generate n rnd (vector n)) newQCGen
32+
33+ -- | Produce n values from a generator
34+ gens :: Int -> Gen a -> IO [a]
35+ gens n gen =
36+- fmap (\ rnd -> generate 1000 rnd (sequence (replicate n gen))) newStdGen
37++ fmap (\ rnd -> generate 1000 rnd (sequence (replicate n gen))) newQCGen
38+
39+ -- The next two are from twanvl:
40+
41+@@ -500,10 +501,10 @@
42+
43+ -- TODO: are there QC2 replacements for these QC1 operations?
44+
45+-rand :: Gen StdGen
46++rand :: Gen QCGen
47+ rand = MkGen (\r _ -> r)
48+
49+-generate :: Int -> StdGen -> Gen a -> a
50++generate :: Int -> QCGen -> Gen a -> a
51+ generate n rnd (MkGen m) = m rnd' size
52+ where
53+ (size, rnd') = randomR (0, n) rnd
54+diff -ru orig/src/Test/QuickCheck/Instances/List.hs new/src/Test/QuickCheck/Instances/List.hs
55+--- orig/src/Test/QuickCheck/Instances/List.hs 2014-06-10 13:09:03.518534168 +0300
56++++ new/src/Test/QuickCheck/Instances/List.hs 2014-06-10 13:09:03.000000000 +0300
57+@@ -8,7 +8,7 @@
58+ ,decreasingInf,nonincreasingInf
59+ ) where
60+
61+-import Test.QuickCheck
62++import Test.QuickCheck hiding (infiniteList)
63+ import Test.QuickCheck.Instances.Num
64+ import Control.Applicative
65+
patching/patches/uuid-1.3.3.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ru orig/uuid.cabal new/uuid.cabal
2+--- orig/uuid.cabal 2014-06-10 13:09:03.962534162 +0300
3++++ new/uuid.cabal 2014-06-10 13:09:03.000000000 +0300
4+@@ -67,7 +67,7 @@
5+ uuid,
6+ bytestring >= 0.9 && < 1.1,
7+ HUnit >=1.2 && < 1.3,
8+- QuickCheck >=2.4 && < 2.7,
9++ QuickCheck >=2.4 && < 2.8,
10+ random >= 1.0.1 && < 1.1,
11+ test-framework == 0.8.*,
12+ test-framework-hunit == 0.3.*,