diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-11 10:57:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-11 10:57:20 -0400 |
| commit | 148aebe3ff9e4953a4800aa0301c8c6038587ed0 (patch) | |
| tree | 10cf8a8c6484952063f5b1c2cf29d6a1233c0879 | |
| parent | 4b3bba02fe0658c95f5003dc7e59af3bc8fcffe3 (diff) | |
Fix build with aws-0.17.
This commit was sponsored by Denis Dzyubenko on Patreon.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Remote/S3.hs | 3 | ||||
| -rw-r--r-- | doc/bugs/Cannot_build_with_aws_0.17.1.mdwn | 2 | ||||
| -rw-r--r-- | stack.yaml | 2 |
4 files changed, 7 insertions, 1 deletions
@@ -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 <id@joeyh.name> Sat, 07 Oct 2017 14:11:00 -0400 diff --git a/Remote/S3.hs b/Remote/S3.hs index 5e76b9810..5b100eb1a 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 c28560cf3..3a3a52894 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 d40b53ee9..e8f36f43d 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 |