From 1683b7109f3ee99cd0150d486aaac96f9a0ddd24 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Wed, 13 Nov 2024 21:56:35 +0000
Subject: [PATCH] fix TH in ghc 8.10.7

---
 package.yaml                  |  2 +-
 simplex-chat.cabal            | 14 +++++++-------
 src/Simplex/Chat.hs           |  6 +++---
 src/Simplex/Chat/Operators.hs |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.yaml b/package.yaml
index 7cf20c46e5..4a95d52044 100644
--- a/package.yaml
+++ b/package.yaml
@@ -74,7 +74,7 @@ when:
       - bytestring == 0.10.*
       - process >= 1.6 && < 1.6.18
       - template-haskell == 2.16.*
-      - text >= 1.2.3.0 && < 1.3
+      - text >= 1.2.4.0 && < 1.3
 
 library:
   source-dirs: src
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 9f50bf7bd5..640fc2ddbf 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -254,7 +254,7 @@ library
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 executable simplex-bot
   main-is: Main.hs
@@ -320,7 +320,7 @@ executable simplex-bot
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 executable simplex-bot-advanced
   main-is: Main.hs
@@ -386,7 +386,7 @@ executable simplex-bot-advanced
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 executable simplex-broadcast-bot
   main-is: Main.hs
@@ -455,7 +455,7 @@ executable simplex-broadcast-bot
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 executable simplex-chat
   main-is: Main.hs
@@ -523,7 +523,7 @@ executable simplex-chat
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 executable simplex-directory-service
   main-is: Main.hs
@@ -595,7 +595,7 @@ executable simplex-directory-service
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
 
 test-suite simplex-chat-test
   type: exitcode-stdio-1.0
@@ -698,7 +698,7 @@ test-suite simplex-chat-test
         bytestring ==0.10.*
       , process >=1.6 && <1.6.18
       , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
+      , text >=1.2.4.0 && <1.3
   if impl(ghc >= 9.6.2)
     build-depends:
         hspec ==2.11.*
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index a856a76eb7..a46ad9a60c 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -409,7 +409,7 @@ newChatController
                 useXFTP = 0
               }
       agentServers :: DB.Connection -> ChatConfig -> RandomServers -> IO InitialAgentServers
-      agentServers db ChatConfig {presetServers = PresetServers {operators = presetOps, ntf, netCfg}} randomServers = do
+      agentServers db ChatConfig {presetServers = PresetServers {operators = presetOps, ntf, netCfg}} rs = do
         users <- getUsers db
         opDomains <- operatorDomains <$> getUpdateServerOperators db presetOps (null users)
         smp' <- getServers SPSMP users opDomains
@@ -418,9 +418,9 @@ newChatController
         where
           getServers :: forall p. (ProtocolTypeI p, UserProtocol p) => SProtocolType p -> [User] -> [(Text, ServerOperator)] -> IO (Map UserId (NonEmpty (ServerCfg p)))
           getServers p users opDomains = do
-            let randomSrvs = rndServers p randomServers
+            let rs' = rndServers p rs
             fmap M.fromList $ forM users $ \u ->
-              (aUserId u,) . agentServerCfgs opDomains randomSrvs <$> getUpdateUserServers db p presetOps randomSrvs u
+              (aUserId u,) . agentServerCfgs opDomains rs' <$> getUpdateUserServers db p presetOps rs' u
 
 updateNetworkConfig :: NetworkConfig -> SimpleNetCfg -> NetworkConfig
 updateNetworkConfig cfg SimpleNetCfg {socksProxy, socksMode, hostMode, requiredHostMode, smpProxyMode_, smpProxyFallback_, smpWebPort, tcpTimeout_, logTLSErrors} =
diff --git a/src/Simplex/Chat/Operators.hs b/src/Simplex/Chat/Operators.hs
index 81541074c8..55b62ad3ab 100644
--- a/src/Simplex/Chat/Operators.hs
+++ b/src/Simplex/Chat/Operators.hs
@@ -60,7 +60,7 @@ previousConditionsCommit = "edf99fcd1d7d38d2501d19608b94c084cf00f2ac"
 usageConditionsText :: Text
 usageConditionsText =
   $( let s = $(embedFile =<< makeRelativeToProject "PRIVACY.md")
-      in [|stripFrontMatter (safeDecodeUtf8 $(lift s))|]
+      in [|stripFrontMatter $(lift (safeDecodeUtf8 s))|]
    )
 
 data DBStored = DBStored | DBNew