diff options
| author |   matoro <matoro@users.noreply.github.com> | 2022-07-29 21:57:05 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-07-30 06:58:54 +0100 |
| commit | 11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae (patch) | |
| tree | 4d495ead228606df2d7214c1deabc05c631bfa75 /dev-vcs/git-annex/files | |
| parent | dev-haskell/git-lfs: add 1.2.0, drop 1.1.2 (diff) | |
| download | gentoo-11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae.tar.gz gentoo-11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae.tar.bz2 gentoo-11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae.zip | |
dev-vcs/git-annex: add 10.20220624, drop 8.20200810
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.patch | 28 |
1 files changed, 28 insertions, 0 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 new file mode 100644 index 000000000000..977e5931f5f4 --- /dev/null +++ b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch @@ -0,0 +1,28 @@ +--- 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 |