git.iko.soy/stackage
on master help sign in
Remove outdated patches
commit29b62780b167381e9a59e9f6255f1937fc2d40bf authorMichael Snoyman <michael@snoyman.com> dateTue 3 Sep 2013, 13:19 (13 years ago) parenta35384a
3 files changed−77
compare with master
unifiedsplit
patching/patches/HTF-0.11.0.0.patch−32 patching/patches/bytes-0.11.4.patch−17 patching/patches/test-framework-th-prime-0.0.5.patch−28
patching/patches/HTF-0.11.0.0.patchdeleted−32
@@ -1,32 +0,0 @@
1−diff -ru orig/HTF.cabal new/HTF.cabal
2−--- orig/HTF.cabal 2013-09-01 15:37:06.661829510 +0300
3−+++ new/HTF.cabal 2013-09-01 15:37:06.000000000 +0300
4−@@ -153,7 +153,7 @@
5− QuickCheck >= 2.3,
6− base == 4.*,
7− random >= 1.0,
8−- containers >= 0.5,
9−+ containers >= 0.4.2.1,
10− process >= 1.0,
11− directory >= 1.0,
12− mtl >= 1.1 && < 2.2,
13−diff -ru orig/Test/Framework/XmlOutput.hs new/Test/Framework/XmlOutput.hs
14−--- orig/Test/Framework/XmlOutput.hs 2013-09-01 15:37:06.649829507 +0300
15−+++ new/Test/Framework/XmlOutput.hs 2013-09-01 15:37:06.000000000 +0300
16−@@ -1,3 +1,4 @@
17−+{-# LANGUAGE CPP #-}
18− {- |
19−
20− See <http://pzolee.blogs.balabit.com/2012/11/jenkins-vs-junit-xml-format/>
21−@@ -16,7 +17,11 @@
22−
23− import qualified Data.ByteString.Lazy as BSL
24− import qualified Data.List as List
25−+#if MIN_VERSION_containers(0, 5, 0)
26− import qualified Data.Map.Strict as Map
27−+#else
28−+import qualified Data.Map as Map
29−+#endif
30− import qualified Data.Text as T
31− import Text.Printf
32−
patching/patches/bytes-0.11.4.patchdeleted−17
@@ -1,17 +0,0 @@
1−diff -ru orig/src/Data/Bytes/VarInt.hs new/src/Data/Bytes/VarInt.hs
2−--- orig/src/Data/Bytes/VarInt.hs 2013-09-02 11:35:18.532306195 +0300
3−+++ new/src/Data/Bytes/VarInt.hs 2013-09-02 11:35:18.000000000 +0300
4−@@ -36,9 +36,11 @@
5−
6− -- | Integer/Word types serialized to base-128 variable-width ints.
7− --
8−--- >>> runPutL $ serialize (97 :: Word64)
9−+-- >>> import Data.Monoid (mconcat)
10−+-- >>> import Data.ByteString.Lazy (toChunks)
11−+-- >>> mconcat $ toChunks $ runPutL $ serialize (97 :: Word64)
12− -- "\NUL\NUL\NUL\NUL\NUL\NUL\NULa"
13−--- >>> runPutL $ serialize (97 :: VarInt Word64)
14−+-- >>> mconcat $ toChunks $ runPutL $ serialize (97 :: VarInt Word64)
15− -- "a"
16− newtype VarInt n = VarInt { unVarInt :: n }
17− deriving (Eq, Ord, Show, Enum, Num, Integral, Bounded, Real, Bits)
patching/patches/test-framework-th-prime-0.0.5.patchdeleted−28
@@ -1,28 +0,0 @@
1−diff -ru orig/Test/Framework/TH/Prime/Parser.hs new/Test/Framework/TH/Prime/Parser.hs
2−--- orig/Test/Framework/TH/Prime/Parser.hs 2013-09-02 08:29:48.372542031 +0300
3−+++ new/Test/Framework/TH/Prime/Parser.hs 2013-09-02 08:29:48.000000000 +0300
4−@@ -1,3 +1,4 @@
5−+{-# LANGUAGE CPP #-}
6− module Test.Framework.TH.Prime.Parser (
7− unitPropTests
8− , symbol, string
9−@@ -66,11 +67,19 @@
10− ParseFailed _ _ ->
11− []
12− where
13−+#if MIN_VERSION_haskell_src_exts(1, 14, 0)
14−+ toExtention = parseExtension . toStr
15−+#else
16− toExtention = read . toStr
17−+#endif
18− toStr (Ident str) = str
19− toStr (Symbol str) = str
20− opt raw = defaultParseMode {
21−+#if MIN_VERSION_haskell_src_exts(1, 14, 0)
22−+ extensions = nub $ EnableExtension TemplateHaskell : exts raw
23−+#else
24− extensions = nub $ TemplateHaskell : exts raw
25−+#endif
26− -- to prevent "Ambiguous infix expression"
27− , fixities = Nothing
28− }