mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow enabling the servant build flag with older versions of stm

Browse source 
Allowing building with ghc 9.0.2 (debian stable).
This commit is contained in:
Joey Hess 2024-10-17 13:44:38 -04:00
parent c738920d19
commit 3a53c60121
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -3,6 +3,8 @@ git-annex (10.20240928) UNRELEASED; urgency=medium
* p2phttp: Support serving unauthenticated users while requesting * p2phttp: Support serving unauthenticated users while requesting
authentication for operations that need it. Eg, --unauth-readonly authentication for operations that need it. Eg, --unauth-readonly
can be combined with --authenv. 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 -- Joey Hess <id@joeyh.name> Thu, 17 Oct 2024 11:02:17 -0400

5
P2P/Http/Client.hs
View file

@ -533,6 +533,11 @@ clientKeepLocked lckid remoteuuid unablelock callback clientenv (ProtocolVersion
_ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|>
_ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|>
v3 :<|> v2 :<|> v1 :<|> v0 :<|> _ = client p2pHttpAPI v3 :<|> v2 :<|> v1 :<|> v0 :<|> _ = client p2pHttpAPI
#if ! MIN_VERSION_stm(2,5,1)
writeTMVar t new = tryTakeTMVar t >> putTMVar t new
#endif
#else #else
clientKeepLocked _ _ _ _ = () clientKeepLocked _ _ _ _ = ()
#endif #endif

3
git-annex.cabal
View file

@ -321,8 +321,7 @@ Executable git-annex
servant-client, servant-client,
servant-client-core, servant-client-core,
warp (>= 3.2.8), warp (>= 3.2.8),
warp-tls (>= 3.2.2), warp-tls (>= 3.2.2)
stm (>= 2.5.1)
CPP-Options: -DWITH_SERVANT CPP-Options: -DWITH_SERVANT
Other-Modules: Other-Modules:
Command.P2PHttp Command.P2PHttp