mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
python3Packages.matrix-nio: fix encryption support
The latest version uses python-vodozemac instead of olm.
(cherry picked from commit 6a8a936dbf)
This commit is contained in:
committed by
github-actions[bot]
parent
c931db7a23
commit
6868b206c4
@@ -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; })
|
||||
];
|
||||
}
|
||||
''
|
||||
|
||||
@@ -60,7 +60,7 @@ buildPythonPackage {
|
||||
attrs
|
||||
logbook
|
||||
pygments
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
(matrix-nio.override { withVodozemac = true; })
|
||||
aiohttp
|
||||
requests
|
||||
];
|
||||
|
||||
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
setuptools
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
(matrix-nio.override { withVodozemac = true; })
|
||||
python-magic
|
||||
markdown
|
||||
pillow
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
|
||||
janus
|
||||
keyring
|
||||
logbook
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
(matrix-nio.override { withVodozemac = true; })
|
||||
peewee
|
||||
platformdirs
|
||||
prompt-toolkit
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user