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

doc/bugs/Build__47__OSXMkLibs.hs_does_not_resolve___64__loader__95__path.mdwn

@@ -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]]

doc/bugs/Build_failing_because_MonadFail_is_not_in_scope.mdwn

@@ -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]]