Allow enabling the servant build flag with older versions of stm
Allowing building with ghc 9.0.2 (debian stable).
This commit is contained in:
parent
c738920d19
commit
3a53c60121
3 changed files with 8 additions and 2 deletions
|
@ -3,6 +3,8 @@ git-annex (10.20240928) UNRELEASED; urgency=medium
|
|||
* p2phttp: Support serving unauthenticated users while requesting
|
||||
authentication for operations that need it. Eg, --unauth-readonly
|
||||
can be combined with --authenv.
|
||||
* Allow enabling the servant build flag with older versions of stm,
|
||||
allowing building with ghc 9.0.2.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 17 Oct 2024 11:02:17 -0400
|
||||
|
||||
|
|
|
@ -533,6 +533,11 @@ clientKeepLocked lckid remoteuuid unablelock callback clientenv (ProtocolVersion
|
|||
_ :<|> _ :<|> _ :<|>
|
||||
_ :<|> _ :<|> _ :<|> _ :<|>
|
||||
v3 :<|> v2 :<|> v1 :<|> v0 :<|> _ = client p2pHttpAPI
|
||||
|
||||
#if ! MIN_VERSION_stm(2,5,1)
|
||||
writeTMVar t new = tryTakeTMVar t >> putTMVar t new
|
||||
#endif
|
||||
|
||||
#else
|
||||
clientKeepLocked _ _ _ _ = ()
|
||||
#endif
|
||||
|
|
|
@ -321,8 +321,7 @@ Executable git-annex
|
|||
servant-client,
|
||||
servant-client-core,
|
||||
warp (>= 3.2.8),
|
||||
warp-tls (>= 3.2.2),
|
||||
stm (>= 2.5.1)
|
||||
warp-tls (>= 3.2.2)
|
||||
CPP-Options: -DWITH_SERVANT
|
||||
Other-Modules:
|
||||
Command.P2PHttp
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue