[Backport release-26.05] matrix-synapse: 1.158.0 -> 1.159.0, fix test (#555211)

nixos/tests/matrix/mjolnir.nix

@@ -118,7 +118,7 @@ in
           (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"
             {
               libraries = with pkgs.python3Packages; [
-                (matrix-nio.override { withOlm = true; })
+                (matrix-nio.override { withVodozemac = true; })
               ];
             }
             ''

pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix

@@ -60,7 +60,7 @@ buildPythonPackage {
     attrs
     logbook
     pygments
-    (matrix-nio.override { withOlm = true; })
+    (matrix-nio.override { withVodozemac = true; })
     aiohttp
     requests
   ];

pkgs/by-name/ma/matrix-commander/package.nix

@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   ]
   ++ (with python3Packages; [
     setuptools
-    (matrix-nio.override { withOlm = true; })
+    (matrix-nio.override { withVodozemac = true; })
     python-magic
     markdown
     pillow

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

@@ -14,19 +14,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.158.0";
+  version = "1.159.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-9H2qhEnmqgC3kAdmWWCMay6zZU8czjCX4S2AXHwMBIo=";
+    hash = "sha256-Fdbr+uMKFTZl1ETyaDavsSCpJYwS5+eLqifMlLGtDeA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-rYO/1QRYS2J28RvgNXymcOa+2k+Djm+6kFmzUfYXoIQ=";
+    hash = "sha256-9VmEej1AKvGMMgbdyvm0DFZJ9sLP2WcV29+xVtOLV4g=";
   };
 
   build-system =

pkgs/by-name/op/opsdroid/package.nix

@@ -36,7 +36,7 @@ python3Packages.buildPythonPackage rec {
     emoji
     get-video-properties
     ibm-watson
-    (matrix-nio.override { withOlm = true; })
+    (matrix-nio.override { withVodozemac = true; })
     mattermostdriver
     motor
     multidict

pkgs/by-name/pa/pantalaimon/package.nix

@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
       janus
       keyring
       logbook
-      (matrix-nio.override { withOlm = true; })
+      (matrix-nio.override { withVodozemac = true; })
       peewee
       platformdirs
       prompt-toolkit

pkgs/development/python-modules/matrix-nio/default.nix

@@ -20,7 +20,7 @@
   atomicwrites,
   cachetools,
   peewee,
-  python-olm,
+  vodozemac,
 
   # tests
   aioresponses,
@@ -40,7 +40,7 @@
   weechatScripts,
   zulip,
 
-  withOlm ? false,
+  withVodozemac ? false,
 }:
 
 buildPythonPackage rec {
@@ -72,13 +72,13 @@ buildPythonPackage rec {
     pycryptodome
     unpaddedbase64
   ]
-  ++ lib.optionals withOlm optional-dependencies.e2e;
+  ++ lib.optionals withVodozemac optional-dependencies.e2e;
 
   optional-dependencies = {
     e2e = [
       atomicwrites
       cachetools
-      python-olm
+      vodozemac
       peewee
     ];
   };
@@ -101,7 +101,7 @@ buildPythonPackage rec {
 
   pytestFlags = [ "--benchmark-disable" ];
 
-  disabledTestPaths = lib.optionals (!withOlm) [
+  disabledTestPaths = lib.optionals (!withVodozemac) [
     "tests/encryption_test.py"
     "tests/key_export_test.py"
     "tests/memory_store_test.py"
@@ -116,7 +116,7 @@ buildPythonPackage rec {
     # time dependent and flaky
     "test_transfer_monitor_callbacks"
   ]
-  ++ lib.optionals (!withOlm) [
+  ++ lib.optionals (!withVodozemac) [
     "test_client_account_sharing"
     "test_client_key_query"
     "test_client_login"

pkgs/development/python-modules/vodozemac/default.nix

@@ -0,0 +1,36 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "vodozemac";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "matrix-nio";
+    repo = "vodozemac-python";
+    rev = finalAttrs.version;
+    hash = "sha256-y0mJsDRJzhwkYOERyMxvw4ih6bSMtmT+YTXds1bIyMI=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-owvBFMoem6hn4dC9pR/DVqZoHFl7oIRBBodmAgWmDxU=";
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.maturinBuildHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  meta = {
+    description = "Python bindings for vodozemac";
+    homepage = "https://github.com/matrix-nio/vodozemac-python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ma27 ];
+  };
+})

pkgs/top-level/python-packages.nix

@@ -21177,6 +21177,8 @@ self: super: with self; {
 
   vobject = callPackage ../development/python-modules/vobject { };
 
+  vodozemac = callPackage ../development/python-modules/vodozemac { };
+
   voip-utils = callPackage ../development/python-modules/voip-utils { };
 
   volatile = callPackage ../development/python-modules/volatile { };