[Pkg-haskell-commits] [package-plan] 01/02: Some patches on the long road to resourcet/conduit transition
Clint Adams
clint at moszumanska.debian.org
Sat Jun 7 13:55:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository package-plan.
commit 0b3d87e2649f72132c26848a4b0858af7a9b62a8
Author: Clint Adams <clint at debian.org>
Date: Fri Jun 6 23:11:25 2014 -0400
Some patches on the long road to resourcet/conduit transition
---
packages.txt | 2 +
.../csv-conduit/0.6.3/no-attoparsec-conduit.diff | 10 ++++
patches/csv-conduit/0.6.3/series | 1 +
patches/http-conduit/2.1.2/no-network-conduit.diff | 10 ++++
patches/http-conduit/2.1.2/series | 1 +
patches/publicsuffixlist/0.1/newer-conduit.diff | 64 ++++++++++++++++++++++
patches/publicsuffixlist/0.1/series | 1 +
patches/sandi/0.3.0/older-base.diff | 11 ++++
patches/sandi/0.3.0/series | 1 +
patches/warp-tls/2.0.5/no-network-conduit.diff | 10 ++++
patches/warp-tls/2.0.5/series | 1 +
...aze-builder-conduit-and-no-network-conduit.diff | 18 ++++++
patches/warp/2.1.5.2/series | 1 +
13 files changed, 131 insertions(+)
diff --git a/packages.txt b/packages.txt
index c459ad5..f34800c 100644
--- a/packages.txt
+++ b/packages.txt
@@ -103,6 +103,7 @@ ConfigFile 1.1.1
configurator 0.2.0.2
connection 0.2.1
contravariant 0.4.4
+control-monad-free 0.5.3
control-monad-loop 0.1
convertible 1.1.0.0
cookie 0.4.1.1
@@ -690,6 +691,7 @@ web-routes-hsp 0.24.1
web-routes-th 0.22.1
websockets 0.8.1.1
weighted-regexp 0.3.1.2
+wizards 1.0.1
wl-pprint-text 1.1.0.2
word8 0.0.4
X11 1.6.1.2
diff --git a/patches/csv-conduit/0.6.3/no-attoparsec-conduit.diff b/patches/csv-conduit/0.6.3/no-attoparsec-conduit.diff
new file mode 100644
index 0000000..b6dbeb3
--- /dev/null
+++ b/patches/csv-conduit/0.6.3/no-attoparsec-conduit.diff
@@ -0,0 +1,10 @@
+--- a/csv-conduit.cabal
++++ b/csv-conduit.cabal
+@@ -74,7 +74,6 @@
+ hs-source-dirs: src
+ build-depends:
+ attoparsec >= 0.10
+- , attoparsec-conduit >= 0.5.0.2
+ , base >= 4 && < 5
+ , bytestring
+ , conduit >= 1.0 && < 2.0
diff --git a/patches/csv-conduit/0.6.3/series b/patches/csv-conduit/0.6.3/series
new file mode 100644
index 0000000..89ad6b7
--- /dev/null
+++ b/patches/csv-conduit/0.6.3/series
@@ -0,0 +1 @@
+no-attoparsec-conduit.diff
diff --git a/patches/http-conduit/2.1.2/no-network-conduit.diff b/patches/http-conduit/2.1.2/no-network-conduit.diff
new file mode 100644
index 0000000..480cae2
--- /dev/null
+++ b/patches/http-conduit/2.1.2/no-network-conduit.diff
@@ -0,0 +1,10 @@
+--- a/http-conduit.cabal
++++ b/http-conduit.cabal
+@@ -64,7 +64,6 @@
+ , warp >= 2.0 && < 2.2
+ , http-types
+ , cookie
+- , network-conduit >= 0.6
+ , http-client
+ , http-conduit
+ , conduit-extra
diff --git a/patches/http-conduit/2.1.2/series b/patches/http-conduit/2.1.2/series
new file mode 100644
index 0000000..9626b40
--- /dev/null
+++ b/patches/http-conduit/2.1.2/series
@@ -0,0 +1 @@
+no-network-conduit.diff
diff --git a/patches/publicsuffixlist/0.1/newer-conduit.diff b/patches/publicsuffixlist/0.1/newer-conduit.diff
new file mode 100644
index 0000000..7c05708
--- /dev/null
+++ b/patches/publicsuffixlist/0.1/newer-conduit.diff
@@ -0,0 +1,64 @@
+--- a/publicsuffixlist.cabal
++++ b/publicsuffixlist.cabal
+@@ -22,6 +22,8 @@
+ build-depends: base >= 4 && < 5
+ , containers
+ , data-default
++ , exceptions
++ , resourcet
+ , bytestring >= 0.9
+ , text >= 0.11
+ , utf8-string
+@@ -29,6 +31,7 @@
+ if flag(create)
+ build-depends: idna >= 0.1.2 && < 1.0
+ , conduit >= 1.0.0 && < 2.0.0
++ , conduit-extra
+ exposed-modules: Network.PublicSuffixList.Lookup
+ , Network.PublicSuffixList.DataStructure
+ other-modules: Network.PublicSuffixList.Types
+@@ -46,6 +49,7 @@
+ build-depends: base >= 4 && < 5
+ , containers
+ , data-default
++ , resourcet
+ , text >= 0.11
+ , HUnit
+ , idna >= 0.1.1 && < 1.0
+--- a/Network/PublicSuffixList/Create.hs
++++ b/Network/PublicSuffixList/Create.hs
+@@ -24,6 +24,7 @@
+ module Network.PublicSuffixList.Create (PublicSuffixListException, sink) where
+
+ import Control.Exception
++import Control.Monad.Catch (MonadThrow)
+ import qualified Data.ByteString as BS
+ import qualified Data.Conduit as C
+ import qualified Data.Conduit.List as CL
+@@ -67,6 +68,6 @@
+ {-
+ Generate the opaque 'DataStructure'
+ -}
+-sink :: C.MonadThrow m => C.Sink BS.ByteString m DataStructure
++sink :: MonadThrow m => C.Sink BS.ByteString m DataStructure
+ sink = CT.decode CT.utf8 C.=$ CT.lines C.=$ CL.fold foldingFunction def
+
+--- a/Network/PublicSuffixList/DataStructure.hs
++++ b/Network/PublicSuffixList/DataStructure.hs
+@@ -5,6 +5,7 @@
+
+ module Network.PublicSuffixList.DataStructure (dataStructure) where
+
++import Control.Monad.Trans.Resource (runResourceT)
+ import Data.ByteString.Char8 ()
+
+ import Network.PublicSuffixList.Types
+@@ -29,7 +30,7 @@
+ dataStructure :: DataStructure
+ #if defined(RUNTIMELIST)
+ {-# NOINLINE dataStructure #-}
+-dataStructure = unsafePerformIO $ C.runResourceT $ sourceFile RUNTIMELIST C.$$ PSLC.sink
++dataStructure = unsafePerformIO $ runResourceT $ sourceFile RUNTIMELIST C.$$ PSLC.sink
+ #else
+ dataStructure = let Right ds = runGet getDataStructure serializedDataStructure in ds
+
diff --git a/patches/publicsuffixlist/0.1/series b/patches/publicsuffixlist/0.1/series
new file mode 100644
index 0000000..cc66eba
--- /dev/null
+++ b/patches/publicsuffixlist/0.1/series
@@ -0,0 +1 @@
+newer-conduit.diff
diff --git a/patches/sandi/0.3.0/older-base.diff b/patches/sandi/0.3.0/older-base.diff
new file mode 100644
index 0000000..d6dae11
--- /dev/null
+++ b/patches/sandi/0.3.0/older-base.diff
@@ -0,0 +1,11 @@
+--- a/sandi.cabal
++++ b/sandi.cabal
+@@ -24,7 +24,7 @@
+ ghc-options: -Wall
+ cc-options: -Wall -Wextra
+ build-depends:
+- base ==4.7.*,
++ base >= 4.7 && < 4.8,
+ bytestring ==0.10.*,
+ conduit ==1.1.*,
+ exceptions ==0.6.*
diff --git a/patches/sandi/0.3.0/series b/patches/sandi/0.3.0/series
new file mode 100644
index 0000000..d2ea9bd
--- /dev/null
+++ b/patches/sandi/0.3.0/series
@@ -0,0 +1 @@
+older-base.diff
diff --git a/patches/warp-tls/2.0.5/no-network-conduit.diff b/patches/warp-tls/2.0.5/no-network-conduit.diff
new file mode 100644
index 0000000..7ad6764
--- /dev/null
+++ b/patches/warp-tls/2.0.5/no-network-conduit.diff
@@ -0,0 +1,10 @@
+--- a/warp-tls.cabal
++++ b/warp-tls.cabal
+@@ -20,7 +20,6 @@
+ , transformers >= 0.2
+ , conduit >= 0.5 && < 1.2
+ , conduit-extra
+- , network-conduit >= 0.6 && < 1.2
+ , data-default-class >= 0.0.1
+ , tls >= 1.2.1
+ , network >= 2.2.1
diff --git a/patches/warp-tls/2.0.5/series b/patches/warp-tls/2.0.5/series
new file mode 100644
index 0000000..9626b40
--- /dev/null
+++ b/patches/warp-tls/2.0.5/series
@@ -0,0 +1 @@
+no-network-conduit.diff
diff --git a/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff b/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff
new file mode 100644
index 0000000..540cec8
--- /dev/null
+++ b/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff
@@ -0,0 +1,18 @@
+--- a/warp.cabal
++++ b/warp.cabal
+@@ -39,7 +39,6 @@
+ Build-Depends: base >= 3 && < 5
+ , array
+ , blaze-builder >= 0.3.3 && < 0.4
+- , blaze-builder-conduit >= 0.5 && < 1.2
+ , bytestring >= 0.9.1.4
+ , case-insensitive >= 0.2
+ , conduit >= 0.5 && < 1.2
+@@ -47,7 +46,6 @@
+ , ghc-prim
+ , http-types >= 0.7
+ , lifted-base >= 0.1
+- , network-conduit >= 0.5 && < 1.2
+ , simple-sendfile >= 0.2.7 && < 0.3
+ , transformers >= 0.2.2
+ , unix-compat >= 0.2
diff --git a/patches/warp/2.1.5.2/series b/patches/warp/2.1.5.2/series
new file mode 100644
index 0000000..8d82af9
--- /dev/null
+++ b/patches/warp/2.1.5.2/series
@@ -0,0 +1 @@
+no-blaze-builder-conduit-and-no-network-conduit.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list