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

This commit is contained in:
Joey Hess 2020-12-09 12:35:17 -04:00
commit 4bce767ca6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 30 additions and 1 deletions

View file

@ -9,5 +9,5 @@ CallStack (from HasCallStack):
I attempted to patch `Build/OSXMkLibs.hs` to handle this myself, but the file containing this syntax is another dynamic lib, and the code doesn't seem to record the original paths that dynamic libraries are copied from, and so the patch would be nontrivial.
[[!meta author=yoh]]
[[!meta author=jwodder]]
[[!tag projects/datalad]]

View file

@ -0,0 +1,29 @@
As of commit b9c1aa925, trying to build git-annex on either Ubuntu or macOS fails with:
```
Annex/TransferrerPool.hs:56:24: error:
Not in scope: type constructor or class `MonadFail'
|
| :: (MonadIO m, MonadFail m, MonadMask m)
| ^^^^^^^^^
```
This can be fixed with the following patch:
```
diff --git a/Annex/TransferrerPool.hs b/Annex/TransferrerPool.hs
index 973f75629..0de145461 100644
--- a/Annex/TransferrerPool.hs
+++ b/Annex/TransferrerPool.hs
@@ -28,6 +28,7 @@ import Utility.ThreadScheduler
import Control.Concurrent
import Control.Concurrent.Async
import Control.Concurrent.STM hiding (check)
+import Control.Monad.Fail (MonadFail)
import Control.Monad.IO.Class (MonadIO)
import Text.Read (readMaybe)
import Data.Time.Clock.POSIX
```
[[!meta author=jwodder]]
[[!tag projects/datalad]]