Skip to content
Commits on Source (55)
Show whitespace changes
Inline Side-by-side
p/cabal-debian/debian/changelog
View file @ f962bb39
cabal-debian (4.38.1-1) unstable; urgency=medium
* New upstream release
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:12:40 +0300
cabal-debian (4.38-1) unstable; urgency=medium
[ Clint Adams ]
......
p/darcs/debian/changelog
View file @ f962bb39
darcs (2.14.0-2) UNRELEASED; urgency=medium
darcs (2.14.1-1) unstable; urgency=medium
* Bump debhelper compat level to 10
* New upstream release
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:06:46 +0300
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:13:17 +0300
darcs (2.14.0-1) unstable; urgency=medium
......
p/darcs/debian/control
View file @ f962bb39
......@@ -15,7 +15,7 @@ Build-Depends:
libghc-http-dev (<< 1:4000.4),
libghc-http-prof,
libghc-async-dev (>= 2.0.2),
libghc-async-dev (<< 2.2),
libghc-async-dev (<< 2.3),
libghc-async-prof,
libghc-attoparsec-dev (>= 0.13.0.1),
libghc-attoparsec-dev (<< 0.14),
......@@ -28,8 +28,10 @@ Build-Depends:
libghc-data-ordlist-dev (<< 0.5),
libghc-data-ordlist-prof,
libghc-fgl-dev (>= 5.5.2.3),
libghc-fgl-dev (<< 5.7),
libghc-fgl-prof,
libghc-graphviz-dev (>= 2999.18.1),
libghc-graphviz-dev (<< 2999.20.1),
libghc-graphviz-prof,
libghc-hashable-dev (>= 1.2.3.3),
libghc-hashable-dev (<< 1.3),
......@@ -42,8 +44,8 @@ Build-Depends:
libghc-mtl-dev (>= 2.2.1),
libghc-mtl-dev (<< 2.3),
libghc-mtl-prof,
libghc-network-dev (<< 2.7),
libghc-network-dev (>= 2.6),
libghc-network-dev (<< 2.8),
libghc-network-prof,
libghc-network-uri-dev (>= 2.6),
libghc-network-uri-dev (<< 2.7),
......@@ -70,9 +72,6 @@ Build-Depends:
libghc-tar-dev (>= 0.5),
libghc-tar-dev (<< 0.6),
libghc-tar-prof,
libghc-temporary-dev (>= 1.2.0.4),
libghc-temporary-dev (<< 1.3),
libghc-temporary-prof,
libghc-text-dev (>= 1.2.1.3),
libghc-text-dev (<< 1.3),
libghc-text-prof,
......@@ -116,7 +115,6 @@ Build-Depends-Indep:
libghc-sandi-doc,
libghc-stm-doc,
libghc-tar-doc,
libghc-temporary-doc,
libghc-text-doc,
libghc-unix-compat-doc,
libghc-utf8-string-doc,
......
p/darcs/debian/patches/newer-deps deleted 100644 → 0
View file @ 26f2e603
--- a/darcs.cabal
+++ b/darcs.cabal
@@ -389,8 +389,8 @@
mtl >= 2.2.1 && < 2.3,
transformers >= 0.4.2.0 && < 0.6,
parsec >= 3.1.9 && < 3.2,
- fgl >= 5.5.2.3 && < 5.6,
- graphviz >= 2999.18.1 && < 2999.20,
+ fgl >= 5.5.2.3,
+ graphviz >= 2999.18.1,
html >= 1.0.1.2 && < 1.1,
filepath >= 1.4.1 && < 1.5.0.0,
haskeline >= 0.7.2 && < 0.8,
p/haskell-aeson-extra/debian/changelog
View file @ f962bb39
haskell-aeson-extra (0.4.1.0-4) UNRELEASED; urgency=medium
haskell-aeson-extra (0.4.1.1-1) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
[ Ilias Tsitsimpis ]
* Bump debhelper compat level to 10
* New upstream release
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:09:12 -0400
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:14:31 +0300
haskell-aeson-extra (0.4.1.0-3) unstable; urgency=medium
......
p/haskell-aeson-extra/debian/control
View file @ f962bb39
......@@ -12,7 +12,7 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-aeson-dev (>= 0.7.0.6),
libghc-aeson-dev (<< 1.3),
libghc-aeson-dev (<< 1.4),
libghc-aeson-prof,
libghc-aeson-compat-dev (>= 0.3.0.0),
libghc-aeson-compat-dev (<< 0.4),
......@@ -23,11 +23,11 @@ Build-Depends:
libghc-attoparsec-iso8601-dev (>= 1.0),
libghc-attoparsec-iso8601-dev (<< 1.1),
libghc-attoparsec-iso8601-prof,
libghc-base-compat-dev (>= 0.6.0),
libghc-base-compat-dev (<< 0.10),
libghc-base-compat-prof,
libghc-exceptions-dev (<< 0.9),
libghc-base-compat-batteries-dev (>= 0.10.1),
libghc-base-compat-batteries-dev (<< 0.11),
libghc-base-compat-batteries-prof,
libghc-exceptions-dev (>= 0.8),
libghc-exceptions-dev (<< 0.11),
libghc-exceptions-prof,
libghc-hashable-dev (<< 1.3),
libghc-hashable-dev (>= 1.2),
......@@ -57,10 +57,14 @@ Build-Depends:
libghc-quickcheck-instances-dev (<< 0.4),
libghc-tasty-dev (>= 0.10),
libghc-tasty-dev (<< 1.1),
libghc-tasty-prof,
libghc-tasty-hunit-dev (>= 0.9),
libghc-tasty-hunit-dev (<< 0.11),
libghc-tasty-hunit-prof,
libghc-tasty-quickcheck-dev (>= 0.8),
libghc-tasty-quickcheck-dev (<< 0.10),
libghc-tasty-quickcheck-dev (<< 0.11),
libghc-tasty-quickcheck-prof,
libghc-these-dev,
libghc-time-parsers-dev (>= 0.1.0.0),
libghc-time-parsers-dev (<< 0.2),
libghc-unordered-containers-dev,
......@@ -70,7 +74,7 @@ Build-Depends-Indep: ghc-doc,
libghc-aeson-compat-doc,
libghc-attoparsec-doc,
libghc-attoparsec-iso8601-doc,
libghc-base-compat-doc,
libghc-base-compat-batteries-doc,
libghc-exceptions-doc,
libghc-hashable-doc,
libghc-parsec3-doc,
......
p/haskell-aeson-extra/debian/patches/newer-deps deleted 100644 → 0
View file @ 26f2e603
--- a/aeson-extra.cabal
+++ b/aeson-extra.cabal
@@ -78,8 +78,8 @@
, unordered-containers
, vector
, time-parsers >=0.1.0.0 && <0.2
- , tasty >=0.10 && <0.12
- , tasty-hunit >=0.9 && <0.10
+ , tasty >=0.10 && <1.1
+ , tasty-hunit >=0.9 && <0.11
, tasty-quickcheck >=0.8 && <0.10
, quickcheck-instances >=0.3 && <0.4
other-modules:
p/haskell-aeson/debian/changelog
View file @ f962bb39
haskell-aeson (1.2.4.0-3) UNRELEASED; urgency=medium
haskell-aeson (1.3.1.1-1) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
[ Ilias Tsitsimpis ]
* Bump debhelper compat level to 10
* New upstream release
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:09:12 -0400
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:15:59 +0300
haskell-aeson (1.2.4.0-2) unstable; urgency=medium
......
p/haskell-aeson/debian/control
View file @ f962bb39
......@@ -15,7 +15,7 @@ Build-Depends:
libghc-attoparsec-dev (>= 0.13.0.1),
libghc-attoparsec-prof,
libghc-base-compat-dev (>= 0.9.1),
libghc-base-compat-dev (<< 0.10),
libghc-base-compat-dev (<< 0.11),
libghc-base-compat-prof,
libghc-dlist-dev (>= 0.6),
libghc-dlist-prof,
......@@ -33,11 +33,7 @@ Build-Depends:
libghc-tagged-dev (<< 0.9),
libghc-tagged-dev (>= 0.8.3),
libghc-tagged-prof,
libghc-test-framework-dev,
libghc-test-framework-hunit-dev,
libghc-test-framework-quickcheck2-dev,
libghc-text-dev,
libghc-text-dev (>= 1.1.1.0),
libghc-text-dev (>= 1.2.3),
libghc-text-prof,
libghc-th-abstraction-dev (>= 0.2.2),
libghc-th-abstraction-dev (<< 0.3),
......
p/haskell-aeson/debian/patches/newer-deps deleted 100644 → 0
View file @ 26f2e603
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -200,19 +200,19 @@
build-depends:
HUnit,
- QuickCheck >= 2.10.0.1 && < 2.11,
+ QuickCheck >= 2.10.0.1 && < 2.12,
aeson,
integer-logarithms >= 1 && <1.1,
attoparsec,
base,
base-compat,
- base-orphans >= 0.5.3 && <0.7,
+ base-orphans >= 0.5.3 && <0.8,
base16-bytestring,
containers,
directory,
dlist,
filepath,
- generic-deriving >= 1.10 && < 1.12,
+ generic-deriving >= 1.10 && < 1.13,
ghc-prim >= 0.2,
hashable >= 1.2.4.0,
scientific,
p/haskell-ansi-terminal/debian/changelog
View file @ f962bb39
haskell-ansi-terminal (0.8.0.4-2) UNRELEASED; urgency=medium
haskell-ansi-terminal (0.8.1-1) unstable; urgency=medium
* Bump debhelper compat level to 10
* New upstream release
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:06:49 +0300
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:16:44 +0300
haskell-ansi-terminal (0.8.0.4-1) unstable; urgency=medium
......
p/haskell-async/debian/changelog
View file @ f962bb39
haskell-async (2.1.1.1-3) UNRELEASED; urgency=medium
haskell-async (2.2.1-1) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
[ Ilias Tsitsimpis ]
* Bump debhelper compat level to 10
* New upstream release
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:09:14 -0400
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:17:15 +0300
haskell-async (2.1.1.1-2) unstable; urgency=medium
......
p/haskell-async/debian/control
View file @ f962bb39
......@@ -9,13 +9,18 @@ Build-Depends: debhelper (>= 10),
cdbs,
ghc (>= 8),
ghc-prof,
libghc-hashable-dev (>= 1.1.1.0),
libghc-hashable-dev (<< 1.3),
libghc-hashable-prof,
libghc-stm-dev (>= 2.2),
libghc-stm-dev (<< 2.5),
libghc-stm-prof,
libghc-stm-dev,
libghc-hunit-dev,
libghc-test-framework-dev,
libghc-test-framework-hunit-dev,
Build-Depends-Indep: ghc-doc,
libghc-hashable-doc,
libghc-stm-doc,
Standards-Version: 4.1.4
Homepage: https://github.com/simonmar/async
......
p/haskell-aws/debian/changelog
View file @ f962bb39
haskell-aws (0.19-3) UNRELEASED; urgency=medium
haskell-aws (0.20-1) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
[ Ilias Tsitsimpis ]
* Bump debhelper compat level to 10
* New upstream release
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:09:15 -0400
-- Ilias Tsitsimpis <iliastsi@debian.org> Sat, 29 Sep 2018 14:17:38 +0300
haskell-aws (0.19-2) unstable; urgency=medium
......
p/haskell-aws/debian/control
View file @ f962bb39
......@@ -68,6 +68,9 @@ Build-Depends:
libghc-network-dev (<< 3),
libghc-network-dev (>= 2),
libghc-network-prof,
libghc-old-locale-dev (>= 1),
libghc-old-locale-dev (<< 2),
libghc-old-locale-prof,
libghc-resourcet-dev (>= 1.2),
libghc-resourcet-dev (<< 1.3),
libghc-resourcet-prof,
......@@ -105,6 +108,7 @@ Build-Depends-Indep:
libghc-conduit-extra-doc,
libghc-cryptonite-doc,
libghc-data-default-doc,
libghc-exceptions-doc,
libghc-http-conduit-doc,
libghc-http-types-doc,
libghc-lifted-base-doc,
......
p/haskell-aws/debian/patches/series deleted 100644 → 0
View file @ 26f2e603
update-to-conduit-1.3-untested.patch
p/haskell-aws/debian/patches/update-to-conduit-1.3-untested.patch deleted 100644 → 0
View file @ 26f2e603
From 3758da0850575dba66fbac9a2ca45ee5ef7fc3c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 22 Apr 2018 14:34:27 -0400
Subject: [PATCH] update to conduit-1.3 (untested)
The new conduit removed ResumableSource, replacing it with
SealedConduitT. Rather than use that, changed to using runConduit and
.| where it used to use $$+-
I *think* that will behave the same, but have not tested it.
Note that the type of HTTPResponseConsumer changed accordingly;
this may be an API change for aws and need a major version bump.
The removal of ResumableSource required the removal of this line from
s3ResponseConsumer:
C.closeResumableSource (HTTP.responseBody resp)
So there's a potential for a change to the http response resource
lifetime having been introduced by these changes. I don't understand
conduit well enough to say if this is really a problem.
See this blog post for background:
https://www.snoyman.com/blog/2018/01/drop-conduits-finalizers
Also, added a dependency on exceptions, since ResourceT
no longer has a MonadBaseControl instance.
---
Aws/Aws.hs | 4 ++--
Aws/Core.hs | 22 ++++++----------------
Aws/DynamoDb/Core.hs | 2 +-
Aws/S3/Commands/GetObject.hs | 5 +++--
Aws/S3/Core.hs | 5 ++---
Aws/Sqs/Core.hs | 5 +++--
aws.cabal | 11 ++++++-----
7 files changed, 23 insertions(+), 31 deletions(-)
--- a/Aws/Aws.hs
+++ b/Aws/Aws.hs
@@ -35,8 +35,8 @@
import Aws.Core
import Control.Applicative
-import qualified Control.Exception.Lifted as E
import Control.Monad
+import qualified Control.Monad.Catch as E
import Control.Monad.IO.Class
import Control.Monad.Trans
import Control.Monad.Trans.Resource
@@ -91,7 +91,7 @@
baseConfiguration = liftIO $ do
cr <- loadCredentialsDefault
case cr of
- Nothing -> E.throw $ NoCredentialsException "could not locate aws credentials"
+ Nothing -> E.throwM $ NoCredentialsException "could not locate aws credentials"
Just cr' -> return Configuration {
timeInfo = Timestamp
, credentials = cr'
--- a/Aws/Core.hs
+++ b/Aws/Core.hs
@@ -115,7 +115,7 @@
import qualified Data.ByteString.Lazy as L
import qualified Data.ByteString.UTF8 as BU
import Data.Char
-import Data.Conduit (($$+-))
+import Data.Conduit ((.|))
import qualified Data.Conduit as C
#if MIN_VERSION_http_conduit(2,2,0)
import qualified Data.Conduit.Binary as CB
@@ -195,7 +195,7 @@
tellMetadataRef r m = modifyIORef r (`mappend` m)
-- | A full HTTP response parser. Takes HTTP status, response headers, and response body.
-type HTTPResponseConsumer a = HTTP.Response (C.ResumableSource (ResourceT IO) ByteString)
+type HTTPResponseConsumer a = HTTP.Response (C.ConduitM () ByteString (ResourceT IO) ())
-> ResourceT IO a
-- | Class for types that AWS HTTP responses can be parsed into.
@@ -217,7 +217,7 @@
instance ResponseConsumer r (HTTP.Response L.ByteString) where
type ResponseMetadata (HTTP.Response L.ByteString) = ()
responseConsumer _ _ _ resp = do
- bss <- HTTP.responseBody resp $$+- CL.consume
+ bss <- C.runConduit $ HTTP.responseBody resp .| CL.consume
return resp
{ HTTP.responseBody = L.fromChunks bss
}
@@ -875,23 +875,13 @@
instance E.Exception NoCredentialsException
-- | A helper to throw an 'HTTP.StatusCodeException'.
-throwStatusCodeException :: HTTP.Request
- -> HTTP.Response (C.ResumableSource (ResourceT IO) ByteString)
- -> ResourceT IO a
-#if MIN_VERSION_http_conduit(2,2,0)
+throwStatusCodeException :: MonadThrow m => HTTP.Request -> HTTP.Response (C.ConduitM () ByteString m ()) -> m a
throwStatusCodeException req resp = do
let resp' = fmap (const ()) resp
-- only take first 10kB of error response
- body <- HTTP.responseBody resp C.$$+- CB.take (10*1024)
+ body <- C.runConduit $ HTTP.responseBody resp .| CB.take (10*1024)
let sce = HTTP.StatusCodeException resp' (L.toStrict body)
throwM $ HTTP.HttpExceptionRequest req sce
-#else
-throwStatusCodeException _req resp = do
- let cookies = HTTP.responseCookieJar resp
- headers = HTTP.responseHeaders resp
- status = HTTP.responseStatus resp
- throwM $ HTTP.StatusCodeException status headers cookies
-#endif
-- | A specific element (case-insensitive, ignoring namespace - sadly necessary), extracting only the textual contents.
elContent :: T.Text -> Cursor -> [T.Text]
@@ -939,7 +929,7 @@
-> IORef m
-> HTTPResponseConsumer a
xmlCursorConsumer parse metadataRef res
- = do doc <- HTTP.responseBody res $$+- XML.sinkDoc XML.def
+ = do doc <- C.runConduit $ HTTP.responseBody res .| XML.sinkDoc XML.def
let cursor = Cu.fromDocument doc
let Response metadata x = parse cursor
liftIO $ tellMetadataRef metadataRef metadata
--- a/Aws/DynamoDb/Core.hs
+++ b/Aws/DynamoDb/Core.hs
@@ -895,7 +895,7 @@
-------------------------------------------------------------------------------
ddbResponseConsumer :: A.FromJSON a => IORef DdbResponse -> HTTPResponseConsumer a
ddbResponseConsumer ref resp = do
- val <- HTTP.responseBody resp $$+- sinkParser (A.json' <* AttoB.endOfInput)
+ val <- runConduit $ HTTP.responseBody resp .| sinkParser (A.json' <* AttoB.endOfInput)
case statusCode of
200 -> rSuccess val
_ -> rError val
--- a/Aws/S3/Commands/GetObject.hs
+++ b/Aws/S3/Commands/GetObject.hs
@@ -11,6 +11,7 @@
import qualified Data.ByteString.Char8 as B8
import qualified Data.ByteString.Lazy as L
import qualified Data.Conduit as C
+import Data.Conduit ((.|))
import qualified Data.Conduit.List as CL
import Data.Maybe
import qualified Data.Text as T
@@ -44,7 +45,7 @@
data GetObjectResponse
= GetObjectResponse {
gorMetadata :: ObjectMetadata,
- gorResponse :: HTTP.Response (C.ResumableSource (ResourceT IO) B8.ByteString)
+ gorResponse :: HTTP.Response (C.ConduitM () B8.ByteString (ResourceT IO) ())
}
data GetObjectMemoryResponse
@@ -96,7 +97,7 @@
instance AsMemoryResponse GetObjectResponse where
type MemoryResponse GetObjectResponse = GetObjectMemoryResponse
loadToMemory (GetObjectResponse om x) = do
- bss <- HTTP.responseBody x C.$$+- CL.consume
+ bss <- C.runConduit $ HTTP.responseBody x .| CL.consume
return $ GetObjectMemoryResponse om x
{ HTTP.responseBody = L.fromChunks bss
}
--- a/Aws/S3/Core.hs
+++ b/Aws/S3/Core.hs
@@ -7,7 +7,7 @@
import Control.Monad.IO.Class
import Control.Monad.Trans.Resource (MonadThrow, throwM)
import Data.Char (isAscii, isAlphaNum, toUpper, ord)
-import Data.Conduit (($$+-))
+import Data.Conduit ((.|))
import Data.Function
import Data.Functor ((<$>))
import Data.IORef
@@ -418,7 +418,6 @@
where inner' resp =
do
!res <- inner resp
- C.closeResumableSource (HTTP.responseBody resp)
return res
s3BinaryResponseConsumer :: HTTPResponseConsumer a
@@ -444,7 +443,7 @@
s3ErrorResponseConsumer :: HTTPResponseConsumer a
s3ErrorResponseConsumer resp
- = do doc <- HTTP.responseBody resp $$+- XML.sinkDoc XML.def
+ = do doc <- C.runConduit $ HTTP.responseBody resp .| XML.sinkDoc XML.def
let cursor = Cu.fromDocument doc
liftIO $ case parseError cursor of
Right err -> throwM err
--- a/Aws/Sqs/Core.hs
+++ b/Aws/Sqs/Core.hs
@@ -11,7 +11,8 @@
import Control.Monad.Trans.Resource (MonadThrow, throwM)
import qualified Data.ByteString as B
import qualified Data.ByteString.Char8 as BC
-import Data.Conduit (($$+-))
+import qualified Data.Conduit
+import Data.Conduit ((.|))
import Data.IORef
import Data.List
import Data.Maybe
@@ -248,7 +249,7 @@
sqsErrorResponseConsumer :: HTTPResponseConsumer a
sqsErrorResponseConsumer resp
- = do doc <- HTTP.responseBody resp $$+- XML.sinkDoc XML.def
+ = do doc <- Data.Conduit.runConduit $ HTTP.responseBody resp .| XML.sinkDoc XML.def
let cursor = Cu.fromDocument doc
liftIO $ case parseError cursor of
Right err -> throwM err
--- a/aws.cabal
+++ b/aws.cabal
@@ -123,22 +123,23 @@
bytestring >= 0.9 && < 0.11,
case-insensitive >= 0.2 && < 1.3,
cereal >= 0.3 && < 0.6,
- conduit >= 1.1 && < 1.3,
- conduit-extra >= 1.1 && < 1.3,
+ conduit >= 1.3 && < 1.4,
+ conduit-extra >= 1.3 && < 1.4,
containers >= 0.4,
cryptonite >= 0.11,
data-default >= 0.5.3 && < 0.8,
directory >= 1.0 && < 2.0,
filepath >= 1.1 && < 1.5,
- http-conduit >= 2.1 && < 2.4,
+ http-conduit >= 2.3 && < 2.4,
http-types >= 0.7 && < 1.0,
lifted-base >= 0.1 && < 0.3,
memory,
monad-control >= 0.3,
+ exceptions >= 0.8 && < 0.11,
mtl == 2.*,
network == 2.*,
old-locale == 1.*,
- resourcet >= 1.1 && < 1.2,
+ resourcet >= 1.2 && < 1.3,
safe >= 0.3 && < 0.4,
scientific >= 0.3,
tagged >= 0.7 && < 0.9,
@@ -148,7 +149,7 @@
unordered-containers >= 0.2,
utf8-string >= 0.3 && < 1.1,
vector >= 0.10,
- xml-conduit >= 1.2 && <2.0
+ xml-conduit >= 1.8 && <2.0
if !impl(ghc >= 7.6)
Build-depends: ghc-prim