From 61dccecad7d9110ecaf339eeceab7e109b3118c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Oct 2017 10:57:20 -0400 Subject: [PATCH] Fix build with aws-0.17. This commit was sponsored by Denis Dzyubenko on Patreon. --- CHANGELOG | 1 + Remote/S3.hs | 3 +++ doc/bugs/Cannot_build_with_aws_0.17.1.mdwn | 2 ++ stack.yaml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index efc81decf9..d9684762ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ git-annex (6.20171004) UNRELEASED; urgency=medium * webdav: Make --debug show all webdav operations. + * Fix build with aws-0.17. -- Joey Hess Sat, 07 Oct 2017 14:11:00 -0400 diff --git a/Remote/S3.hs b/Remote/S3.hs index 5e76b98100..5b100eb1aa 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -497,6 +497,9 @@ withS3HandleMaybe c gc u a = do Just creds -> do awscreds <- liftIO $ genCredentials creds let awscfg = AWS.Configuration AWS.Timestamp awscreds debugMapper +#ifdef MIN_VERSION_aws(0,11,0) + Nothing +#endif bracketIO (newManager managerSettings) closeManager $ \mgr -> a $ Just $ S3Handle mgr awscfg s3cfg Nothing -> a Nothing diff --git a/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn b/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn index c28560cf3b..3a3a528947 100644 --- a/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn +++ b/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn @@ -43,3 +43,5 @@ Full build log is here: https://gist.github.com/ilovezfs/661a158dbe8aac33802f9b4 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Yes! :) + +> [[fixed|done]] --[[Joey]] diff --git a/stack.yaml b/stack.yaml index d40b53ee9a..e8f36f43d9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ flags: packages: - '.' extra-deps: -- aws-0.16 +- aws-0.17.1 - bloomfilter-2.0.1.0 - torrent-10000.1.1 - yesod-default-1.2.0