From 9a14b9e5df9c1a8a63cc8a1483b93d1c3424d2d1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 7 Sep 2014 18:30:25 +0300
Subject: [PATCH] Remove some patches

---
 Stackage/Config.hs                    |  4 --
 patching/patches/checkers-0.3.2.patch | 65 ---------------------------
 patching/patches/judy-0.2.2.patch     | 13 ------
 3 files changed, 82 deletions(-)
 delete mode 100644 patching/patches/checkers-0.3.2.patch
 delete mode 100644 patching/patches/judy-0.2.2.patch

diff --git a/Stackage/Config.hs b/Stackage/Config.hs
index 3c917075..611bff74 100644
--- a/Stackage/Config.hs
+++ b/Stackage/Config.hs
@@ -230,10 +230,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
                 | otherwise -> "-any"
 
     when (ghcVer >= GhcMajorVersion 7 6) $ add "michael@snoyman.com" "cabal-src"
-#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
-    -- Does not compile on Windows
-    mapM_ (add "michael@snoyman.com") $ words "judy"
-#endif
 
     mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
         [ "web-fpco th-expand-syns configurator smtLib"
diff --git a/patching/patches/checkers-0.3.2.patch b/patching/patches/checkers-0.3.2.patch
deleted file mode 100644
index 5ff0397e..00000000
--- a/patching/patches/checkers-0.3.2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ru orig/checkers.cabal new/checkers.cabal
---- orig/checkers.cabal	2014-06-10 13:09:03.522534168 +0300
-+++ new/checkers.cabal	2014-06-10 13:09:03.000000000 +0300
-@@ -27,7 +27,7 @@
- Library
-   hs-Source-Dirs:      src
-   Extensions:
--  Build-Depends:       base < 5, random, QuickCheck>=2.3 && <2.7, array >= 0.1
-+  Build-Depends:       base < 5, random, QuickCheck>=2.3 && <2.8, array >= 0.1
-   Exposed-Modules:     
-                        Test.QuickCheck.Utils
-                        Test.QuickCheck.Checkers
-diff -ru orig/src/Test/QuickCheck/Checkers.hs new/src/Test/QuickCheck/Checkers.hs
---- orig/src/Test/QuickCheck/Checkers.hs	2014-06-10 13:09:03.518534168 +0300
-+++ new/src/Test/QuickCheck/Checkers.hs	2014-06-10 13:09:03.000000000 +0300
-@@ -51,7 +51,8 @@
- import qualified Control.Exception as Ex
- import Data.List (foldl')
- import System.Random
--import Test.QuickCheck
-+import Test.QuickCheck hiding (generate)
-+import Test.QuickCheck.Random (QCGen, newQCGen)
- -- import System.IO.Unsafe
- 
- import Test.QuickCheck.Gen      (Gen (..)) -- for rand
-@@ -442,12 +443,12 @@
- 
- -- | Generate n arbitrary values
- arbs :: Arbitrary a => Int -> IO [a]
--arbs n = fmap (\ rnd -> generate n rnd (vector n)) newStdGen
-+arbs n = fmap (\ rnd -> generate n rnd (vector n)) newQCGen
- 
- -- | Produce n values from a generator
- gens :: Int -> Gen a -> IO [a]
- gens n gen =
--  fmap (\ rnd -> generate 1000 rnd (sequence (replicate n gen))) newStdGen
-+  fmap (\ rnd -> generate 1000 rnd (sequence (replicate n gen))) newQCGen
- 
- -- The next two are from twanvl:
- 
-@@ -500,10 +501,10 @@
- 
- -- TODO: are there QC2 replacements for these QC1 operations?
- 
--rand :: Gen StdGen
-+rand :: Gen QCGen
- rand = MkGen (\r _ -> r)
- 
--generate :: Int -> StdGen -> Gen a -> a
-+generate :: Int -> QCGen -> Gen a -> a
- generate n rnd (MkGen m) = m rnd' size
-  where
-   (size, rnd') = randomR (0, n) rnd
-diff -ru orig/src/Test/QuickCheck/Instances/List.hs new/src/Test/QuickCheck/Instances/List.hs
---- orig/src/Test/QuickCheck/Instances/List.hs	2014-06-10 13:09:03.518534168 +0300
-+++ new/src/Test/QuickCheck/Instances/List.hs	2014-06-10 13:09:03.000000000 +0300
-@@ -8,7 +8,7 @@
-        ,decreasingInf,nonincreasingInf
-        ) where
- 
--import Test.QuickCheck
-+import Test.QuickCheck hiding (infiniteList)
- import Test.QuickCheck.Instances.Num
- import Control.Applicative
- 
diff --git a/patching/patches/judy-0.2.2.patch b/patching/patches/judy-0.2.2.patch
deleted file mode 100644
index d00baf90..00000000
--- a/patching/patches/judy-0.2.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru orig/Data/Judy.hsc new/Data/Judy.hsc
---- orig/Data/Judy.hsc	2014-02-03 16:55:49.814832674 +0200
-+++ new/Data/Judy.hsc	2014-02-03 16:55:49.000000000 +0200
-@@ -104,6 +104,7 @@
- import Foreign hiding (new)
- import Foreign.C.Types
- import Foreign.ForeignPtr
-+import Data.Char (chr)
- 
- import GHC.Ptr
- import GHC.Base
-Only in orig: NOTES
-Only in orig: tests