diff options
| author |   matoro <matoro@users.noreply.github.com> | 2022-07-30 12:51:04 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-07-31 05:10:04 +0100 |
| commit | a8d42ca045c1a615d4cd147324bcb21113cde686 (patch) | |
| tree | 0aea0aada4c6a113d27b773e2c002ce4bece24d4 /dev-vcs | |
| parent | app-shells/bash: add bugs-to, changelog (diff) | |
| download | gentoo-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')
| -rw-r--r-- | dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch | 28 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-10.20220624.ebuild | 2 | ||||
| -rw-r--r-- | dev-vcs/git-annex/metadata.xml | 2 |
3 files changed, 3 insertions, 29 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 977e5931f5f4..000000000000 --- 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 diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild index 3104cec95ee0..875ff88f915e 100644 --- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild +++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux" IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp" +REQUIRED_USE="webapp? ( assistant )" + RDEPEND="dev-haskell/aeson:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index 82dde5fc9a30..1f73976ae199 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>haskell@gentoo.org</email> |