Remove outdated patches

This commit is contained in:
Michael Snoyman 2013-09-03 13:19:29 +03:00
parent a35384aeb2
commit 29b62780b1
3 changed files with 0 additions and 77 deletions

View File

@ -1,32 +0,0 @@
diff -ru orig/HTF.cabal new/HTF.cabal
--- orig/HTF.cabal 2013-09-01 15:37:06.661829510 +0300
+++ new/HTF.cabal 2013-09-01 15:37:06.000000000 +0300
@@ -153,7 +153,7 @@
QuickCheck >= 2.3,
base == 4.*,
random >= 1.0,
- containers >= 0.5,
+ containers >= 0.4.2.1,
process >= 1.0,
directory >= 1.0,
mtl >= 1.1 && < 2.2,
diff -ru orig/Test/Framework/XmlOutput.hs new/Test/Framework/XmlOutput.hs
--- orig/Test/Framework/XmlOutput.hs 2013-09-01 15:37:06.649829507 +0300
+++ new/Test/Framework/XmlOutput.hs 2013-09-01 15:37:06.000000000 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{- |
See <http://pzolee.blogs.balabit.com/2012/11/jenkins-vs-junit-xml-format/>
@@ -16,7 +17,11 @@
import qualified Data.ByteString.Lazy as BSL
import qualified Data.List as List
+#if MIN_VERSION_containers(0, 5, 0)
import qualified Data.Map.Strict as Map
+#else
+import qualified Data.Map as Map
+#endif
import qualified Data.Text as T
import Text.Printf

View File

@ -1,17 +0,0 @@
diff -ru orig/src/Data/Bytes/VarInt.hs new/src/Data/Bytes/VarInt.hs
--- orig/src/Data/Bytes/VarInt.hs 2013-09-02 11:35:18.532306195 +0300
+++ new/src/Data/Bytes/VarInt.hs 2013-09-02 11:35:18.000000000 +0300
@@ -36,9 +36,11 @@
-- | Integer/Word types serialized to base-128 variable-width ints.
--
--- >>> runPutL $ serialize (97 :: Word64)
+-- >>> import Data.Monoid (mconcat)
+-- >>> import Data.ByteString.Lazy (toChunks)
+-- >>> mconcat $ toChunks $ runPutL $ serialize (97 :: Word64)
-- "\NUL\NUL\NUL\NUL\NUL\NUL\NULa"
--- >>> runPutL $ serialize (97 :: VarInt Word64)
+-- >>> mconcat $ toChunks $ runPutL $ serialize (97 :: VarInt Word64)
-- "a"
newtype VarInt n = VarInt { unVarInt :: n }
deriving (Eq, Ord, Show, Enum, Num, Integral, Bounded, Real, Bits)

View File

@ -1,28 +0,0 @@
diff -ru orig/Test/Framework/TH/Prime/Parser.hs new/Test/Framework/TH/Prime/Parser.hs
--- orig/Test/Framework/TH/Prime/Parser.hs 2013-09-02 08:29:48.372542031 +0300
+++ new/Test/Framework/TH/Prime/Parser.hs 2013-09-02 08:29:48.000000000 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Test.Framework.TH.Prime.Parser (
unitPropTests
, symbol, string
@@ -66,11 +67,19 @@
ParseFailed _ _ ->
[]
where
+#if MIN_VERSION_haskell_src_exts(1, 14, 0)
+ toExtention = parseExtension . toStr
+#else
toExtention = read . toStr
+#endif
toStr (Ident str) = str
toStr (Symbol str) = str
opt raw = defaultParseMode {
+#if MIN_VERSION_haskell_src_exts(1, 14, 0)
+ extensions = nub $ EnableExtension TemplateHaskell : exts raw
+#else
extensions = nub $ TemplateHaskell : exts raw
+#endif
-- to prevent "Ambiguous infix expression"
, fixities = Nothing
}