mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2024-12-17 17:20:21 +01:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ace687b7d3 | |||
| 59b5d07252 | |||
| 82400aac66 | |||
| 7df7434a92 | |||
| f243f01bd1 | |||
| 6607c24de3 | |||
| 4086238090 | |||
| a1bbecc7ad | |||
| efa0d6d551 | |||
| 17214a55e9 |
@@ -131,6 +131,10 @@ jobs:
|
||||
echo " extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib" >> cabal.project.local
|
||||
echo " flags: +openssl" >> cabal.project.local
|
||||
echo "" >> cabal.project.local
|
||||
echo "package rocksdb-haskell-jprupp" >> cabal.project.local
|
||||
echo " extra-include-dirs: /opt/homebrew/opt/rocksdb/include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib" >> cabal.project.local
|
||||
|
||||
- name: Unix prepare cabal.project.local for Mac
|
||||
if: matrix.os == 'macos-13'
|
||||
@@ -145,14 +149,22 @@ jobs:
|
||||
echo " extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: /usr/local/opt/openssl@1.1/lib" >> cabal.project.local
|
||||
echo " flags: +openssl" >> cabal.project.local
|
||||
echo "" >> cabal.project.local
|
||||
echo "package rocksdb-haskell-jprupp" >> cabal.project.local
|
||||
echo " extra-include-dirs: /opt/homebrew/opt/rocksdb/include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib" >> cabal.project.local
|
||||
|
||||
- name: Install AppImage dependencies
|
||||
if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
|
||||
run: sudo apt install -y desktop-file-utils
|
||||
|
||||
- name: Install package dependencies
|
||||
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
|
||||
run: sudo apt install -y librocksdb-dev
|
||||
|
||||
- name: Install pkg-config for Mac
|
||||
if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
|
||||
run: brew install pkg-config
|
||||
run: brew install pkg-config rocksdb
|
||||
|
||||
- name: Unix prepare cabal.project.local for Ubuntu
|
||||
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
|
||||
@@ -322,6 +334,7 @@ jobs:
|
||||
git
|
||||
perl
|
||||
make
|
||||
mingw-w64-x86_64-rocksdb
|
||||
pacboy: >-
|
||||
toolchain:p
|
||||
cmake:p
|
||||
@@ -341,6 +354,10 @@ jobs:
|
||||
echo " flags: +openssl" >> cabal.project.local
|
||||
echo " extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
|
||||
echo "" >> cabal.project.local
|
||||
echo "package rocksdb-haskell-jprupp" >> cabal.project.local
|
||||
echo " extra-include-dirs: /mingw64/include" >> cabal.project.local
|
||||
echo " extra-lib-dirs: /mingw64/lib" >> cabal.project.local
|
||||
|
||||
rm -rf dist-newstyle/src/direct-sq*
|
||||
sed -i "s/, unix /--, unix /" simplex-chat.cabal
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
|
||||
source-repository-package
|
||||
type: git
|
||||
location: https://github.com/simplex-chat/simplexmq.git
|
||||
tag: a8471eed5be93e7c3741aa4742b24193c9a2d6f5
|
||||
tag: 0b4492879fd36f0b517dca8f5e36dba187bba686
|
||||
|
||||
source-repository-package
|
||||
type: git
|
||||
|
||||
@@ -11,4 +11,8 @@ package direct-sqlcipher
|
||||
extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib
|
||||
flags: +openssl
|
||||
|
||||
package rocksdb-haskell-jprupp
|
||||
extra-include-dirs: /opt/homebrew/opt/rocksdb/include
|
||||
extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib
|
||||
|
||||
test-show-details: direct
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"https://github.com/simplex-chat/simplexmq.git"."a8471eed5be93e7c3741aa4742b24193c9a2d6f5" = "093i40api0dp7rvw6f1f3pww3q5iv6mvbj577nlxp3qqcbvyh6fs";
|
||||
"https://github.com/simplex-chat/simplexmq.git"."0b4492879fd36f0b517dca8f5e36dba187bba686" = "0rrkq84vx9n6rq67v0awfgnwpq3mmyx3rdzg6k9xwir1397bhf7r";
|
||||
"https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
|
||||
"https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
|
||||
"https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
|
||||
|
||||
@@ -51,6 +51,7 @@ import qualified Simplex.Messaging.Crypto.Ratchet as CR
|
||||
import Simplex.Messaging.Protocol (srvHostnamesSMPClientVersion)
|
||||
import Simplex.Messaging.Server (runSMPServerBlocking)
|
||||
import Simplex.Messaging.Server.Env.STM
|
||||
import Simplex.Messaging.Server.MsgStore.Types (AMSType (..), SMSType (..))
|
||||
import Simplex.Messaging.Transport
|
||||
import Simplex.Messaging.Transport.Server (ServerCredentials (..), defaultTransportServerConfig)
|
||||
import Simplex.Messaging.Version
|
||||
@@ -423,7 +424,10 @@ smpServerCfg =
|
||||
{ transports = [(serverPort, transport @TLS, False)],
|
||||
tbqSize = 1,
|
||||
-- serverTbqSize = 1,
|
||||
msgStoreType = AMSType SMSMemory,
|
||||
msgQueueQuota = 16,
|
||||
maxJournalMsgCount = 16,
|
||||
maxJournalStateLines = 16,
|
||||
queueIdBytes = 12,
|
||||
msgIdBytes = 6,
|
||||
storeLogFile = Nothing,
|
||||
|
||||
Reference in New Issue
Block a user