on master help sign in
Remove some patches
commit9a14b9e5df9c1a8a63cc8a1483b93d1c3424d2d1 authorMichael Snoyman <michael@snoyman.com> dateSun 7 Sep 2014, 18:30 (12 years ago) parent9bc59ce
3 files changed−82
Stackage/Config.hs−4 patching/patches/checkers-0.3.2.patch−65 patching/patches/judy-0.2.2.patch−13
Stackage/Config.hs−4
@@ -230,10 +230,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
230230 | otherwise -> "-any"
231231
232232 when (ghcVer >= GhcMajorVersion 7 6) $ add "michael@snoyman.com" "cabal-src"
233−#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
234− -- Does not compile on Windows
235− mapM_ (add "michael@snoyman.com") $ words "judy"
236−#endif
237233
238234 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
239235 [ "web-fpco th-expand-syns configurator smtLib"
patching/patches/checkers-0.3.2.patchdeleted−65
@@ -1,65 +0,0 @@
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/judy-0.2.2.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff -ru orig/Data/Judy.hsc new/Data/Judy.hsc
2−--- orig/Data/Judy.hsc 2014-02-03 16:55:49.814832674 +0200
3−+++ new/Data/Judy.hsc 2014-02-03 16:55:49.000000000 +0200
4−@@ -104,6 +104,7 @@
5− import Foreign hiding (new)
6− import Foreign.C.Types
7− import Foreign.ForeignPtr
8−+import Data.Char (chr)
9−
10− import GHC.Ptr
11− import GHC.Base
12−Only in orig: NOTES
13−Only in orig: tests