Allow enabling the servant build flag with older versions of stm
Allowing building with ghc 9.0.2 (debian stable). Updated patch covering all uses of writeTMVar.
This commit is contained in:
parent
facde8bf85
commit
b83fdf66df
5 changed files with 27 additions and 8 deletions
|
@ -36,6 +36,7 @@ import P2P.Http.Url
|
|||
import Annex.Concurrent
|
||||
import Utility.Url (BasicAuth(..))
|
||||
import Utility.HumanTime
|
||||
import Utility.STM
|
||||
import qualified Git.Credential as Git
|
||||
|
||||
import Servant hiding (BasicAuthData(..))
|
||||
|
@ -46,7 +47,6 @@ import Network.HTTP.Client
|
|||
import qualified Data.ByteString as B
|
||||
import qualified Data.ByteString.Lazy.Internal as LI
|
||||
import qualified Data.Map as M
|
||||
import Control.Concurrent.STM
|
||||
import Control.Concurrent.Async
|
||||
import Control.Concurrent
|
||||
import System.IO.Unsafe
|
||||
|
@ -533,11 +533,6 @@ 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
|
||||
|
|
|
@ -32,13 +32,13 @@ import Annex.WorkerPool
|
|||
import Types.WorkerPool
|
||||
import Types.Direction
|
||||
import Utility.Metered
|
||||
import Utility.STM
|
||||
|
||||
import Servant
|
||||
import qualified Servant.Types.SourceT as S
|
||||
import qualified Data.ByteString as B
|
||||
import qualified Data.ByteString.Lazy as L
|
||||
import qualified Data.ByteString.Lazy.Internal as LI
|
||||
import Control.Concurrent.STM
|
||||
import Control.Concurrent.Async
|
||||
import Control.Concurrent
|
||||
import System.IO.Unsafe
|
||||
|
|
|
@ -35,12 +35,12 @@ import Annex.Proxy
|
|||
import Annex.Cluster
|
||||
import qualified P2P.Proxy as Proxy
|
||||
import qualified Types.Remote as Remote
|
||||
import Utility.STM
|
||||
|
||||
import Servant
|
||||
import qualified Data.Map.Strict as M
|
||||
import qualified Data.Set as S
|
||||
import Control.Concurrent.Async
|
||||
import Control.Concurrent.STM
|
||||
import Data.Time.Clock.POSIX
|
||||
|
||||
data P2PHttpServerState = P2PHttpServerState
|
||||
|
|
23
Utility/STM.hs
Normal file
23
Utility/STM.hs
Normal file
|
@ -0,0 +1,23 @@
|
|||
{- support for old versions of the stm package
|
||||
-
|
||||
- Copyright 2024 Joey Hess <id@joeyh.name>
|
||||
-
|
||||
- License: BSD-2-clause
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# OPTIONS_GHC -fno-warn-tabs #-}
|
||||
|
||||
module Utility.STM (
|
||||
module Control.Concurrent.STM,
|
||||
#if ! MIN_VERSION_stm(2,5,1)
|
||||
writeTMVar
|
||||
#endif
|
||||
) where
|
||||
|
||||
import Control.Concurrent.STM
|
||||
|
||||
#if ! MIN_VERSION_stm(2,5,1)
|
||||
writeTMVar :: TMVar t -> t -> STM ()
|
||||
writeTMVar t new = tryTakeTMVar t >> putTMVar t new
|
||||
#endif
|
|
@ -1119,6 +1119,7 @@ Executable git-annex
|
|||
Utility.SshConfig
|
||||
Utility.SshHost
|
||||
Utility.StatelessOpenPGP
|
||||
Utility.STM
|
||||
Utility.Su
|
||||
Utility.SystemDirectory
|
||||
Utility.Terminal
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue