git.iko.soy/stackage
on master help sign in
Updated bzlib-conduit patch
0b2c787Michael Snoyman
patching/patches/bzlib-conduit-0.2.1.1.patch+40−3
compare with master
unifiedsplit
@@ -1,7 +1,44 @@
1+diff -ru orig/bzlib-conduit.cabal new/bzlib-conduit.cabal
2+--- orig/bzlib-conduit.cabal 2014-04-02 12:25:07.231917434 +0300
3++++ new/bzlib-conduit.cabal 2014-04-02 12:25:06.000000000 +0300
4+@@ -26,7 +26,8 @@
5+ build-depends: base == 4.*
6+ , bytestring >=0.9 && <0.11
7+ , mtl == 2.*
8+- , conduit >= 0.5 && < 1.1
9++ , conduit >= 0.5 && < 1.2
10++ , conduit-extra >= 1.0 && < 1.2
11+ , resourcet
12+ , data-default
13+ , bindings-DSL
14+@@ -54,7 +55,9 @@
15+ , QuickCheck
16+ , random
17+ , conduit
18++ , conduit-extra
19+ , bzlib-conduit
20++ , resourcet
21+
22+ benchmark bench
23+ type: exitcode-stdio-1.0
24+@@ -62,4 +65,5 @@
25+ main-is: bench.hs
26+ build-depends: base == 4.*
27+ , conduit
28++ , conduit-extra
29+ , bzlib-conduit
1diff -ru orig/test/test.hs new/test/test.hs
30diff -ru orig/test/test.hs new/test/test.hs
2−--- orig/test/test.hs 2014-01-29 09:09:40.578369753 +0200
31+--- orig/test/test.hs 2014-04-02 12:25:07.227917434 +0300
3−+++ new/test/test.hs 2014-01-29 09:09:40.000000000 +0200
32++++ new/test/test.hs 2014-04-02 12:25:06.000000000 +0300
33+@@ -1,6 +1,7 @@
34+ {-# LANGUAGE ViewPatterns #-}
35+ import Control.Applicative
36+ import Control.Monad
37++import Control.Monad.Trans.Resource (runResourceT)
38+ import qualified Data.ByteString.Char8 as S
39+ import qualified Data.ByteString.Lazy.Char8 as L
40+ import Data.Conduit
4−@@ -36,4 +36,4 @@
41+@@ -36,4 +37,4 @@
5 <$> replicateM (abs n) randomIO
42 <$> replicateM (abs n) randomIO
6 dest <- runResourceT $ do
43 dest <- runResourceT $ do
7 C.sourceList (P.map S.pack ss) =$= bzip2 =$= bunzip2 $$ B.take (10^9)
44 C.sourceList (P.map S.pack ss) =$= bzip2 =$= bunzip2 $$ B.take (10^9)