From 60258245ebf19e5c63e6ca0b9c97bb99da416bcf Mon Sep 17 00:00:00 2001 From: shum Date: Tue, 23 Jun 2026 16:23:02 +0000 Subject: [PATCH] chore: bump simplexmq pin to 6843b14c --- cabal.project | 2 +- scripts/nix/sha256map.nix | 2 +- .../M20260604_simplex_name_profiles.hs | 32 ------------------- .../M20260606_simplex_name_verified.hs | 21 ------------ .../Migrations/M20260612_smp_role_names.hs | 23 ------------- .../M20260604_simplex_name_profiles.hs | 31 ------------------ .../M20260606_simplex_name_verified.hs | 26 --------------- .../Migrations/M20260612_smp_role_names.hs | 20 ------------ 8 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 src/Simplex/Chat/Store/Postgres/Migrations/M20260604_simplex_name_profiles.hs delete mode 100644 src/Simplex/Chat/Store/Postgres/Migrations/M20260606_simplex_name_verified.hs delete mode 100644 src/Simplex/Chat/Store/Postgres/Migrations/M20260612_smp_role_names.hs delete mode 100644 src/Simplex/Chat/Store/SQLite/Migrations/M20260604_simplex_name_profiles.hs delete mode 100644 src/Simplex/Chat/Store/SQLite/Migrations/M20260606_simplex_name_verified.hs delete mode 100644 src/Simplex/Chat/Store/SQLite/Migrations/M20260612_smp_role_names.hs diff --git a/cabal.project b/cabal.project index ed8213f7c3..c03a7fdba1 100644 --- a/cabal.project +++ b/cabal.project @@ -21,7 +21,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: ce69adfdb2902e7005d71b05a0f41143d5632ec9 + tag: 6843b14cf2b95c4555a6407122dc8235e7b672d8 source-repository-package type: git diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 94acdcdd85..26888033f4 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."ce69adfdb2902e7005d71b05a0f41143d5632ec9" = "0jmcxk0q8fa91a86sqq7xh9dwi8jvccq1nwkgm00av6la78z1izy"; + "https://github.com/simplex-chat/simplexmq.git"."6843b14cf2b95c4555a6407122dc8235e7b672d8" = "0wqxcrdjva5jf2dy01bc2hfv0zslyjbn20n1nppxrbh9fxh997rd"; "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"; diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260604_simplex_name_profiles.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260604_simplex_name_profiles.hs deleted file mode 100644 index 053399a9c4..0000000000 --- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260604_simplex_name_profiles.hs +++ /dev/null @@ -1,32 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.Postgres.Migrations.M20260604_simplex_name_profiles where - -import Data.Text (Text) -import Text.RawString.QQ (r) - -m20260604_simplex_name_profiles :: Text -m20260604_simplex_name_profiles = - [r| -ALTER TABLE contact_profiles ADD COLUMN simplex_name TEXT; -ALTER TABLE group_profiles ADD COLUMN simplex_name TEXT; - -CREATE UNIQUE INDEX idx_contact_profiles_simplex_name - ON contact_profiles(user_id, simplex_name) - WHERE simplex_name IS NOT NULL; - -CREATE UNIQUE INDEX idx_group_profiles_simplex_name - ON group_profiles(user_id, simplex_name) - WHERE simplex_name IS NOT NULL; -|] - -down_m20260604_simplex_name_profiles :: Text -down_m20260604_simplex_name_profiles = - [r| -DROP INDEX idx_group_profiles_simplex_name; -DROP INDEX idx_contact_profiles_simplex_name; - -ALTER TABLE group_profiles DROP COLUMN simplex_name; -ALTER TABLE contact_profiles DROP COLUMN simplex_name; -|] diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260606_simplex_name_verified.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260606_simplex_name_verified.hs deleted file mode 100644 index bdada69239..0000000000 --- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260606_simplex_name_verified.hs +++ /dev/null @@ -1,21 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.Postgres.Migrations.M20260606_simplex_name_verified where - -import Data.Text (Text) -import Text.RawString.QQ (r) - -m20260606_simplex_name_verified :: Text -m20260606_simplex_name_verified = - [r| -ALTER TABLE contacts ADD COLUMN simplex_name_verified_at TIMESTAMPTZ; -ALTER TABLE groups ADD COLUMN simplex_name_verified_at TIMESTAMPTZ; -|] - -down_m20260606_simplex_name_verified :: Text -down_m20260606_simplex_name_verified = - [r| -ALTER TABLE groups DROP COLUMN simplex_name_verified_at; -ALTER TABLE contacts DROP COLUMN simplex_name_verified_at; -|] diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260612_smp_role_names.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260612_smp_role_names.hs deleted file mode 100644 index 89e8f8c803..0000000000 --- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260612_smp_role_names.hs +++ /dev/null @@ -1,23 +0,0 @@ -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.Postgres.Migrations.M20260612_smp_role_names where - -import Data.Text (Text) -import qualified Data.Text as T -import Text.RawString.QQ (r) - -m20260612_smp_role_names :: Text -m20260612_smp_role_names = - T.pack - [r| -ALTER TABLE server_operators ADD COLUMN smp_role_names SMALLINT NOT NULL DEFAULT 0; - -UPDATE server_operators SET smp_role_names = 1 WHERE server_operator_tag = 'simplex'; -|] - -down_m20260612_smp_role_names :: Text -down_m20260612_smp_role_names = - T.pack - [r| -ALTER TABLE server_operators DROP COLUMN smp_role_names; -|] diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260604_simplex_name_profiles.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260604_simplex_name_profiles.hs deleted file mode 100644 index e55d3e316a..0000000000 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260604_simplex_name_profiles.hs +++ /dev/null @@ -1,31 +0,0 @@ -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.SQLite.Migrations.M20260604_simplex_name_profiles where - -import Database.SQLite.Simple (Query) -import Database.SQLite.Simple.QQ (sql) - -m20260604_simplex_name_profiles :: Query -m20260604_simplex_name_profiles = - [sql| -ALTER TABLE contact_profiles ADD COLUMN simplex_name TEXT; -ALTER TABLE group_profiles ADD COLUMN simplex_name TEXT; - -CREATE UNIQUE INDEX idx_contact_profiles_simplex_name - ON contact_profiles(user_id, simplex_name) - WHERE simplex_name IS NOT NULL; - -CREATE UNIQUE INDEX idx_group_profiles_simplex_name - ON group_profiles(user_id, simplex_name) - WHERE simplex_name IS NOT NULL; -|] - -down_m20260604_simplex_name_profiles :: Query -down_m20260604_simplex_name_profiles = - [sql| -DROP INDEX idx_group_profiles_simplex_name; -DROP INDEX idx_contact_profiles_simplex_name; - -ALTER TABLE group_profiles DROP COLUMN simplex_name; -ALTER TABLE contact_profiles DROP COLUMN simplex_name; -|] diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260606_simplex_name_verified.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260606_simplex_name_verified.hs deleted file mode 100644 index f54738216c..0000000000 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260606_simplex_name_verified.hs +++ /dev/null @@ -1,26 +0,0 @@ -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.SQLite.Migrations.M20260606_simplex_name_verified where - -import Database.SQLite.Simple (Query) -import Database.SQLite.Simple.QQ (sql) - --- contacts.simplex_name_verified_at and groups.simplex_name_verified_at record --- the timestamp when the user last verified that the peer's claimed simplex_name --- resolves (via RSLV) to the link stored locally for the contact/group. --- NULL means the claim is unverified and the UI should show an indicator. --- The column is cleared back to NULL whenever the simplex_name claim changes --- (updateContactProfile / updateGroupProfile). -m20260606_simplex_name_verified :: Query -m20260606_simplex_name_verified = - [sql| -ALTER TABLE contacts ADD COLUMN simplex_name_verified_at TEXT; -ALTER TABLE groups ADD COLUMN simplex_name_verified_at TEXT; -|] - -down_m20260606_simplex_name_verified :: Query -down_m20260606_simplex_name_verified = - [sql| -ALTER TABLE groups DROP COLUMN simplex_name_verified_at; -ALTER TABLE contacts DROP COLUMN simplex_name_verified_at; -|] diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260612_smp_role_names.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260612_smp_role_names.hs deleted file mode 100644 index 0afea68839..0000000000 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260612_smp_role_names.hs +++ /dev/null @@ -1,20 +0,0 @@ -{-# LANGUAGE QuasiQuotes #-} - -module Simplex.Chat.Store.SQLite.Migrations.M20260612_smp_role_names where - -import Database.SQLite.Simple (Query) -import Database.SQLite.Simple.QQ (sql) - -m20260612_smp_role_names :: Query -m20260612_smp_role_names = - [sql| -ALTER TABLE server_operators ADD COLUMN smp_role_names INTEGER NOT NULL DEFAULT 0; - -UPDATE server_operators SET smp_role_names = 1 WHERE server_operator_tag = 'simplex'; -|] - -down_m20260612_smp_role_names :: Query -down_m20260612_smp_role_names = - [sql| -ALTER TABLE server_operators DROP COLUMN smp_role_names; -|]