Date: Saturday, May 1, 2021 @ 09:39:43 Author: felixonmars Revision: 925460
upgpkg: git-annex 8.20210428-1 Modified: git-annex/trunk/PKGBUILD Deleted: git-annex/trunk/git-annex-persistent-2.12.patch ---------------------------------+ PKGBUILD | 41 ++++++++----------- git-annex-persistent-2.12.patch | 80 -------------------------------------- 2 files changed, 18 insertions(+), 103 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-01 09:19:12 UTC (rev 925459) +++ PKGBUILD 2021-05-01 09:39:43 UTC (rev 925460) @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team <[email protected]> pkgname=git-annex -pkgver=8.20210330 -pkgrel=21 +pkgver=8.20210428 +pkgrel=1 pkgdesc="Manage files with git, without checking their contents into git" url="https://git-annex.branchable.com/"; license=("AGPL3") @@ -14,31 +14,26 @@ 'haskell-criterion' 'haskell-crypto-api' 'haskell-cryptonite' 'haskell-data-default' 'haskell-dav' 'haskell-dbus' 'haskell-disk-free-space' 'haskell-dlist' 'haskell-edit-distance' 'haskell-fdo-notify' 'haskell-feed' 'haskell-filepath-bytestring' - 'haskell-git-lfs' 'haskell-hinotify' 'haskell-hslogger' 'haskell-http-client' - 'haskell-http-client-restricted' 'haskell-http-client-tls' 'haskell-http-conduit' - 'haskell-http-types' 'haskell-ifelse' 'haskell-magic' 'haskell-memory' 'haskell-microlens' - 'haskell-monad-control' 'haskell-monad-logger' 'haskell-mountpoints' 'haskell-network' - 'haskell-network-info' 'haskell-network-multicast' 'haskell-network-uri' - 'haskell-old-locale' 'haskell-optparse-applicative' 'haskell-path-pieces' - 'haskell-persistent' 'haskell-persistent-sqlite' 'haskell-quickcheck' 'haskell-random' - 'haskell-regex-tdfa' 'haskell-resourcet' 'haskell-safesemaphore' 'haskell-sandi' - 'haskell-securemem' 'haskell-shakespeare' 'haskell-socks' 'haskell-split' - 'haskell-stm-chans' 'haskell-tagsoup' 'haskell-tasty' 'haskell-tasty-hunit' - 'haskell-tasty-quickcheck' 'haskell-tasty-rerun' 'haskell-torrent' 'haskell-unix-compat' - 'haskell-unliftio-core' 'haskell-unordered-containers' 'haskell-utf8-string' 'haskell-uuid' - 'haskell-vector' 'haskell-wai' 'haskell-wai-extra' 'haskell-warp' 'haskell-warp-tls' - 'haskell-yesod' 'haskell-yesod-core' 'haskell-yesod-form' 'haskell-yesod-static') + 'haskell-git-lfs' 'haskell-hinotify' 'haskell-http-client' 'haskell-http-client-restricted' + 'haskell-http-client-tls' 'haskell-http-conduit' 'haskell-http-types' 'haskell-ifelse' + 'haskell-magic' 'haskell-memory' 'haskell-microlens' 'haskell-monad-control' + 'haskell-monad-logger' 'haskell-mountpoints' 'haskell-network' 'haskell-network-info' + 'haskell-network-multicast' 'haskell-network-uri' 'haskell-old-locale' + 'haskell-optparse-applicative' 'haskell-path-pieces' 'haskell-persistent' + 'haskell-persistent-sqlite' 'haskell-quickcheck' 'haskell-random' 'haskell-regex-tdfa' + 'haskell-resourcet' 'haskell-safesemaphore' 'haskell-sandi' 'haskell-securemem' + 'haskell-shakespeare' 'haskell-socks' 'haskell-split' 'haskell-stm-chans' 'haskell-tagsoup' + 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck' 'haskell-tasty-rerun' + 'haskell-torrent' 'haskell-unix-compat' 'haskell-unliftio-core' + 'haskell-unordered-containers' 'haskell-utf8-string' 'haskell-uuid' 'haskell-vector' + 'haskell-wai' 'haskell-wai-extra' 'haskell-warp' 'haskell-warp-tls' 'haskell-yesod' + 'haskell-yesod-core' 'haskell-yesod-form' 'haskell-yesod-static') makedepends=('chrpath' 'ghc' 'uusi') -source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver"; - git-annex-persistent-2.12.patch) -sha512sums=('SKIP' - '13452b53beaeec2cbda61502a8c5e7a9f69ab2ea8b708f2df37b74c6cbef6ed1ad66d9e7199188e00148f66e46eb2bdf7411ca08b6d74e923a9432d1be590325') +source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver";) +sha512sums=('SKIP') prepare() { cd git-annex - # persistent 2.12 compat - patch -p1 -i ../git-annex-persistent-2.12.patch - # persistent-template was merged into persistent uusi -d persistent-template git-annex.cabal sed -i 's/MIN_VERSION_persistent_template/MIN_VERSION_persistent/' Database/ContentIdentifier.hs Database/Export.hs Database/Fsck.hs Database/Keys/SQL.hs Deleted: git-annex-persistent-2.12.patch =================================================================== --- git-annex-persistent-2.12.patch 2021-05-01 09:19:12 UTC (rev 925459) +++ git-annex-persistent-2.12.patch 2021-05-01 09:39:43 UTC (rev 925460) @@ -1,80 +0,0 @@ -From 8868a3a4c7bfaa356d8c0eb7c6abb8b980f63d99 Mon Sep 17 00:00:00 2001 -From: Joey Hess <[email protected]> -Date: Thu, 1 Apr 2021 12:19:47 -0400 -Subject: [PATCH] Fix build with persistent-2.12.0.1 - -persistent stopped using askLogFunc, and the thing to use is askLoggerIO -from monad-logger. Bumped the dep to the first version that contained that. - -Note that the i386ancient build uses a newer monad-logger than 0.3.10, -so the new versioned dep should not break it, and presumably nothing else -either. - -This commit was sponsored by Noam Kremen on Patreon. ---- - CHANGELOG | 6 ++++++ - Database/Handle.hs | 6 +++--- - ...it-annex_8.20210330_fails_to_build_in_brew.mdwn | 2 ++ - ...ent_1_ddf94a16e7075c218473b01b15fdca3d._comment | 14 ++++++++++++++ - git-annex.cabal | 2 +- - 5 files changed, 26 insertions(+), 4 deletions(-) - create mode 100644 doc/bugs/git-annex_8.20210330_fails_to_build_in_brew/comment_1_ddf94a16e7075c218473b01b15fdca3d._comment - -diff --git a/CHANGELOG b/CHANGELOG -index 6f0e0bf35..33c80fa5b 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,9 @@ -+git-annex (8.20210331) UNRELEASED; urgency=medium -+ -+ * Fix build with persistent-2.12.0.1 -+ -+ -- Joey Hess <[email protected]> Thu, 01 Apr 2021 12:17:26 -0400 -+ - git-annex (8.20210330) upstream; urgency=medium - - * Behavior change: When autoenabling special remotes of type S3, weddav, -diff --git a/Database/Handle.hs b/Database/Handle.hs -index 2109ad9ac..d7f1822dc 100644 ---- 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 (MonadLoggerIO, askLoggerIO) - import Control.Concurrent - import Control.Concurrent.Async - import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..)) -@@ -245,7 +245,7 @@ runSqliteRobustly tablename db a = do - -- Like withSqlConn, but more robust. - withSqlConnRobustly - :: (MonadUnliftIO m -- , MonadLogger m -+ , MonadLoggerIO m - , IsPersistBackend backend - , BaseBackend backend ~ SqlBackend - , BackendCompatible SqlBackend backend -@@ -254,7 +254,7 @@ withSqlConnRobustly - -> (backend -> m a) - -> m a - withSqlConnRobustly open f = do -- logFunc <- askLogFunc -+ logFunc <- askLoggerIO - withRunInIO $ \run -> bracket - (open logFunc) - closeRobustly -diff --git a/git-annex.cabal b/git-annex.cabal -index e4f503fb9..92c0cba2d 100644 ---- a/git-annex.cabal -+++ b/git-annex.cabal -@@ -328,7 +328,7 @@ Executable git-annex - filepath-bytestring (>= 1.4.2.1.1), - IfElse, - hslogger, -- monad-logger, -+ monad-logger (>= 0.3.10), - free, - utf8-string, - bytestring,
