diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index f1e5e7821f82..42239e7ed81c 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/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; }) ]; } '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index be2ca10be6a7..24c15c5fbe69 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/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 ]; diff --git a/pkgs/by-name/ma/matrix-commander/package.nix b/pkgs/by-name/ma/matrix-commander/package.nix index a31c193028cb..97ed63a26da1 100644 --- a/pkgs/by-name/ma/matrix-commander/package.nix +++ b/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 diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix index fe558b2531fc..57bbfe9e8a8e 100644 --- a/pkgs/by-name/op/opsdroid/package.nix +++ b/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 diff --git a/pkgs/by-name/pa/pantalaimon/package.nix b/pkgs/by-name/pa/pantalaimon/package.nix index d4dccd139d94..1209826c6239 100644 --- a/pkgs/by-name/pa/pantalaimon/package.nix +++ b/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 diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 75385ef5f24f..42e54cf048a8 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/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"