summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatoro <matoro@users.noreply.github.com>2022-07-30 12:51:04 -0400
committerSam James <sam@gentoo.org>2022-07-31 05:10:04 +0100
commita8d42ca045c1a615d4cd147324bcb21113cde686 (patch)
tree0aea0aada4c6a113d27b773e2c002ce4bece24d4 /dev-vcs/git-annex/files
parentapp-shells/bash: add bugs-to, changelog (diff)
downloadgentoo-a8d42ca045c1a615d4cd147324bcb21113cde686.tar.gz
gentoo-a8d42ca045c1a615d4cd147324bcb21113cde686.tar.bz2
gentoo-a8d42ca045c1a615d4cd147324bcb21113cde686.zip
dev-vcs/git-annex: sync changes from ::haskell
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-vcs/git-annex/files')
-rw-r--r--dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
deleted file mode 100644
index 977e5931f5f..00000000000
--- a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Database/Handle.hs
-+++ b/Database/Handle.hs
-@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite
- import Control.Monad
- import Control.Monad.IO.Class (liftIO)
- import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO)
--import Control.Monad.Logger (MonadLogger)
-+import Control.Monad.Logger (MonadLogger, askLoggerIO, MonadLoggerIO)
- import Control.Concurrent
- import Control.Concurrent.Async
- import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..))
-@@ -246,6 +246,7 @@ runSqliteRobustly tablename db a = do
- withSqlConnRobustly
- :: (MonadUnliftIO m
- , MonadLogger m
-+ , MonadLoggerIO m
- , IsPersistBackend backend
- , BaseBackend backend ~ SqlBackend
- , BackendCompatible SqlBackend backend
-@@ -254,7 +255,7 @@ withSqlConnRobustly
- -> (backend -> m a)
- -> m a
- withSqlConnRobustly open f = do
-- logFunc <- askLogFunc
-+ logFunc <- askLoggerIO
- withRunInIO $ \run -> bracket
- (open logFunc)
- closeRobustly