Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2017-10-04 10:56:19 -04:00
commit baeb9ad988
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 94 additions and 0 deletions

View file

@ -0,0 +1,45 @@
### Please describe the problem.
git-annex doesn't build if the aws dependency is version 0.17.1
This probably wasn't caught during your testing because the stack.yaml is currently set to use aws-0.16.
### What steps will reproduce the problem?
cabal install with --flags=s3\ webapp
### What version of git-annex are you using? On what operating system?
6.20171003 on macOS
### Please provide any additional information below.
The error is
[[!format sh """
[327 of 580] Compiling Remote.Helper.Http ( Remote/Helper/Http.hs, dist/dist-sandbox-69bd6735/build/git-annex/git-annex-tmp/Remote/Helper/Http.o )
[328 of 580] Compiling Remote.WebDAV ( Remote/WebDAV.hs, dist/dist-sandbox-69bd6735/build/git-annex/git-annex-tmp/Remote/WebDAV.o )
[329 of 580] Compiling Remote.S3 ( Remote/S3.hs, dist/dist-sandbox-69bd6735/build/git-annex/git-annex-tmp/Remote/S3.o )
Remote/S3.hs:501:57: error:
• Couldn't match expected type AWS.Configuration
with actual type Maybe
http-client-0.5.7.0:Network.HTTP.Client.Types.Proxy
-> AWS.Configuration
• Probable cause: awscfg is applied to too few arguments
In the second argument of S3Handle, namely awscfg
In the second argument of ($), namely S3Handle mgr awscfg s3cfg
In the second argument of ($), namely
Just $ S3Handle mgr awscfg s3cfg
|
501 | a $ Just $ S3Handle mgr awscfg s3cfg
| ^^^^^^
cabal: Leaving directory '.'
cabal: Error: some packages failed to install:
git-annex-6.20171003-5GFRliFOEl0KqDuhwYRTdH failed during the building phase.
The exception was:
ExitFailure 1
"""]]
Full build log is here: https://gist.github.com/ilovezfs/661a158dbe8aac33802f9b43eb150539
### 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! :)

View file

@ -0,0 +1,49 @@
### Please describe the problem.
git-annex's dependencies fail to install unless fingertree is constrained to < 0.1.2.0
Note this has already been fixed upstream in reducers https://github.com/ekmett/reducers/commit/f18a111d66c343bd472f914baaa948191f8ecf55
However, there hasn't been a new release yet of reducers so it still affects git-annex currently.
### What steps will reproduce the problem?
cabal install --jobs=8 --max-backjumps=100000 --only-dependencies --flags=s3\ webapp
### What version of git-annex are you using? On what operating system?
6.20171003 on macOS
### Please provide any additional information below.
The error is
[[!format sh """
Failed to install reducers-3.12.1
Build log ( /private/tmp/git-annex-20171003-61223-1v5jyd4/git-annex-6.20171003/.cabal-sandbox/logs/ghc-8.2.1/reducers-3.12.1-5Of5cjMdWsgHjbctJQaaa4.log ):
cabal: Entering directory '/tmp/cabal-tmp-62861/reducers-3.12.1'
Configuring reducers-3.12.1...
clang: warning: -Wl,-headerpad_max_install_names: 'linker' input unused
clang: warning: argument unused during compilation: '-L/usr/local/opt/gettext/lib'
clang: warning: argument unused during compilation: '-L/usr/local/opt/libffi/lib'
clang: warning: argument unused during compilation: '-L/usr/local/opt/icu4c/lib'
clang: warning: argument unused during compilation: '-L/usr/local/lib'
clang: warning: argument unused during compilation: '-L/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries'
Preprocessing library for reducers-3.12.1..
Building library for reducers-3.12.1..
[ 1 of 14] Compiling Data.Semigroup.Instances ( src/Data/Semigroup/Instances.hs, dist/dist-sandbox-c97b5ef4/build/Data/Semigroup/Instances.o )
src/Data/Semigroup/Instances.hs:11:10: error:
Duplicate instance declarations:
instance Measured v a => Semigroup (FingerTree v a)
-- Defined at src/Data/Semigroup/Instances.hs:11:10
instance [safe] Measured v a => Semigroup (FingerTree v a)
-- Defined in Data.FingerTree
|
11 | instance Measured v a => Semigroup (FingerTree v a) where
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cabal: Leaving directory '/tmp/cabal-tmp-62861/reducers-3.12.1'
"""]]
Full log is here: https://gist.github.com/ilovezfs/544d546785addbe2c5ef41656fa7eda0
### 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 :)