[arch-commits] Commit in git-annex/trunk (PKGBUILD http-conduit-2.2.patch)
Felix Yan
felixonmars at archlinux.org
Sun Dec 11 01:30:34 UTC 2016
Date: Sunday, December 11, 2016 @ 01:30:33
Author: felixonmars
Revision: 198777
upgpkg: git-annex 6.20161210-1
Modified:
git-annex/trunk/PKGBUILD
Deleted:
git-annex/trunk/http-conduit-2.2.patch
------------------------+
PKGBUILD | 25 +++------
http-conduit-2.2.patch | 129 -----------------------------------------------
2 files changed, 9 insertions(+), 145 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-11 01:16:32 UTC (rev 198776)
+++ PKGBUILD 2016-12-11 01:30:33 UTC (rev 198777)
@@ -3,7 +3,7 @@
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
pkgname=git-annex
-pkgver=6.20161118
+pkgver=6.20161210
pkgrel=1
pkgdesc="Manage files with git, without checking their contents into git"
url="http://git-annex.branchable.com/"
@@ -25,22 +25,15 @@
"haskell-persistent" "haskell-persistent-sqlite" "haskell-persistent-template"
"haskell-quickcheck" "haskell-random" "haskell-regex-tdfa" "haskell-resourcet"
"haskell-safesemaphore" "haskell-sandi" "haskell-securemem" "haskell-shakespeare"
- "haskell-stm" "haskell-tasty" "haskell-tasty-hunit" "haskell-tasty-quickcheck"
- "haskell-tasty-rerun" "haskell-text" "haskell-torrent" "haskell-unix-compat"
- "haskell-unordered-containers" "haskell-utf8-string" "haskell-uuid" "haskell-wai"
- "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" "haskell-xml-types"
- "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" "haskell-yesod-form"
- "haskell-yesod-static")
-source=("git+https://github.com/joeyh/git-annex.git#tag=$pkgver"
- http-conduit-2.2.patch)
-sha256sums=('SKIP'
- '6b9e3cd4b3e5f37a3432c85454e705a91c287c5ccd1d27cf3730cfecdc3353be')
+ "haskell-socks" "haskell-stm" "haskell-stm-chans" "haskell-tasty" "haskell-tasty-hunit"
+ "haskell-tasty-quickcheck" "haskell-tasty-rerun" "haskell-text" "haskell-torrent"
+ "haskell-unix-compat" "haskell-unordered-containers" "haskell-utf8-string"
+ "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls"
+ "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default"
+ "haskell-yesod-form" "haskell-yesod-static")
+source=("git+https://github.com/joeyh/git-annex.git#tag=$pkgver")
+sha256sums=('SKIP')
-prepare() {
- cd git-annex
- patch -p1 -i ../http-conduit-2.2.patch
-}
-
build() {
cd git-annex
Deleted: http-conduit-2.2.patch
===================================================================
--- http-conduit-2.2.patch 2016-12-11 01:16:32 UTC (rev 198776)
+++ http-conduit-2.2.patch 2016-12-11 01:30:33 UTC (rev 198777)
@@ -1,129 +0,0 @@
-From 93a22a1c972d58b17bc0e23a4b5c9768310f943c Mon Sep 17 00:00:00 2001
-From: Alper Nebi Yasak <alpernebiyasak at gmail.com>
-Date: Sat, 10 Dec 2016 15:24:27 +0300
-Subject: [PATCH] Remove http-conduit (<2.2.0) constraint
-
-Since https://github.com/aristidb/aws/issues/206 is resolved, this
-constraint is no longer necessary. However, http-conduit (>=2.2.0)
-requires http-client (>=0.5.0) which introduces some breaking changes.
-This commit also implements those changes depending on the version.
-Fixes: https://git-annex.branchable.com/bugs/Build_with_aws_head_fails/
-
-Signed-off-by: Alper Nebi Yasak <alpernebiyasak at gmail.com>
----
- Remote/S3.hs | 8 +++++++-
- Remote/WebDAV.hs | 17 +++++++++++++++++
- Utility/Url.hs | 8 ++++++++
- git-annex.cabal | 3 +--
- 4 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/Remote/S3.hs b/Remote/S3.hs
-index 4c1bd57..9563b5a 100644
---- a/Remote/S3.hs
-+++ b/Remote/S3.hs
-@@ -49,6 +49,12 @@ import Annex.Content
- import Annex.Url (withUrlOptions)
- import Utility.Url (checkBoth, managerSettings, closeManager)
-
-+#if MIN_VERSION_http_client(0,5,0)
-+import Network.HTTP.Client (responseTimeoutNone)
-+#else
-+responseTimeoutNone = Nothing
-+#endif
-+
- type BucketName = String
-
- remote :: RemoteType
-@@ -430,7 +436,7 @@ withS3HandleMaybe c gc u a = do
- where
- s3cfg = s3Configuration c
- httpcfg = managerSettings
-- { managerResponseTimeout = Nothing }
-+ { managerResponseTimeout = responseTimeoutNone }
-
- s3Configuration :: RemoteConfig -> S3.S3Configuration AWS.NormalQuery
- s3Configuration c = cfg
-diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
-index 19dbaa8..14947f1 100644
---- a/Remote/WebDAV.hs
-+++ b/Remote/WebDAV.hs
-@@ -5,6 +5,7 @@
- - Licensed under the GNU GPL version 3 or higher.
- -}
-
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE ScopedTypeVariables #-}
-
- module Remote.WebDAV (remote, davCreds, configUrl) where
-@@ -34,6 +35,10 @@ import Utility.Url (URLString, matchStatusCodeException)
- import Annex.UUID
- import Remote.WebDAV.DavLocation
-
-+#if MIN_VERSION_http_client(0,5,0)
-+import Network.HTTP.Client (HttpExceptionContent(..), responseStatus)
-+#endif
-+
- remote :: RemoteType
- remote = RemoteType {
- typename = "webdav",
-@@ -302,6 +307,17 @@ goDAV (DavHandle ctx user pass _) a = choke $ run $ prettifyExceptions $ do
- {- Catch StatusCodeException and trim it to only the statusMessage part,
- - eliminating a lot of noise, which can include the whole request that
- - failed. The rethrown exception is no longer a StatusCodeException. -}
-+#if MIN_VERSION_http_client(0,5,0)
-+prettifyExceptions :: DAVT IO a -> DAVT IO a
-+prettifyExceptions a = catchJust (matchStatusCodeException (const True)) a go
-+ where
-+ go (HttpExceptionRequest _ (StatusCodeException response message)) = error $ unwords
-+ [ "DAV failure:"
-+ , show (responseStatus response)
-+ , show (message)
-+ ]
-+ go e = throwM e
-+#else
- prettifyExceptions :: DAVT IO a -> DAVT IO a
- prettifyExceptions a = catchJust (matchStatusCodeException (const True)) a go
- where
-@@ -311,6 +327,7 @@ prettifyExceptions a = catchJust (matchStatusCodeException (const True)) a go
- , show (statusMessage status)
- ]
- go e = throwM e
-+#endif
-
- prepDAV :: DavUser -> DavPass -> DAVT IO ()
- prepDAV user pass = do
-diff --git a/Utility/Url.hs b/Utility/Url.hs
-index 9b68871..d0e1b37 100644
---- a/Utility/Url.hs
-+++ b/Utility/Url.hs
-@@ -350,8 +350,16 @@ hUserAgent = "User-Agent"
- -
- - > catchJust (matchStatusCodeException (== notFound404))
- -}
-+#if MIN_VERSION_http_client(0,5,0)
-+matchStatusCodeException :: (Status -> Bool) -> HttpException -> Maybe HttpException
-+matchStatusCodeException want e@(HttpExceptionRequest _ (StatusCodeException r _))
-+ | want (responseStatus r) = Just e
-+ | otherwise = Nothing
-+matchStatusCodeException _ _ = Nothing
-+#else
- matchStatusCodeException :: (Status -> Bool) -> HttpException -> Maybe HttpException
- matchStatusCodeException want e@(StatusCodeException s _ _)
- | want s = Just e
- | otherwise = Nothing
- matchStatusCodeException _ _ = Nothing
-+#endif
-diff --git a/git-annex.cabal b/git-annex.cabal
-index ec54a14..83d45a1 100644
---- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -357,8 +357,7 @@ Executable git-annex
- resourcet,
- http-client,
- http-types,
-- -- Old version needed due to https://github.com/aristidb/aws/issues/206
-- http-conduit (<2.2.0),
-+ http-conduit,
- time,
- old-locale,
- esqueleto,
More information about the arch-commits
mailing list