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.
This commit is contained in:
parent
4dde355c79
commit
8868a3a4c7
5 changed files with 26 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
git-annex (8.20210331) UNRELEASED; urgency=medium
|
||||
|
||||
* Fix build with persistent-2.12.0.1
|
||||
|
||||
-- Joey Hess <id@joeyh.name> 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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -28,3 +28,5 @@ macOS 10.15.7
|
|||
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||
|
||||
git-annex has been great helping us "version control" a myriad of LARGE binary assets (from VM and FS snapshots, to archives, to deliverable content)
|
||||
|
||||
> [[fixed|done]] --[[Joey]]
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 1"""
|
||||
date="2021-04-01T16:04:56Z"
|
||||
content="""
|
||||
A quick fix is to pin the haskell library persistent to a version older
|
||||
than 2.12.0.1, which is the new version that broke the build. An easy way
|
||||
to do that is to build using stack, which automatically pins all library
|
||||
dependencies to known-working versions. By building with cabal you
|
||||
choose to help me learn about new breakage the hard way, which is
|
||||
appreciated if it is your intent. ;)
|
||||
|
||||
I've fixed this in master.
|
||||
"""]]
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue