1 files changed, 39 insertions, 30 deletions
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index c054cc25a533..1746fa01dbe9 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -1,28 +1,32 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
   # deps
-, aiohttp
-, attrs
-, yarl
+  setuptools,
+  aiohttp,
+  attrs,
+  yarl,
   # optional deps
-, python-magic
-, python-olm
-, unpaddedbase64
-, pycryptodome
+  python-magic,
+  python-olm,
+  unpaddedbase64,
+  pycryptodome,
   # check deps
-, pytestCheckHook
-, pytest-asyncio
-, aiosqlite
-, asyncpg
-, ruamel-yaml
+  pytestCheckHook,
+  pytest-asyncio,
+  aiosqlite,
+  asyncpg,
+  ruamel-yaml,
+
+  withOlm ? false,
 }:
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.20.4";
-  format = "setuptools";
+  version = "0.20.6";
+  pyproject = true;
 
   disabled = pythonOlder "3.10";
 
@@ -30,19 +34,19 @@ buildPythonPackage rec {
     owner = "mautrix";
     repo = "python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-A9d/r4Caeo4tO82/MMXgU5xKvXRDnK0iQUm8AFhDPLM=";
+    hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     attrs
     yarl
-  ];
+  ] ++ lib.optionals withOlm optional-dependencies.encryption;
 
-  passthru.optional-dependencies = {
-    detect_mimetype = [
-      python-magic
-    ];
+  optional-dependencies = {
+    detect_mimetype = [ python-magic ];
     encryption = [
       python-olm
       unpaddedbase64
@@ -56,17 +60,22 @@ buildPythonPackage rec {
     aiosqlite
     asyncpg
     ruamel-yaml
-  ] ++ passthru.optional-dependencies.encryption;
-
-  pythonImportsCheck = [
-    "mautrix"
   ];
 
+  disabledTestPaths = lib.optionals (!withOlm) [ "mautrix/crypto/" ];
+
+  pythonImportsCheck = [ "mautrix" ];
+
   meta = with lib; {
     description = "Asyncio Matrix framework";
     homepage = "https://github.com/tulir/mautrix-python";
     changelog = "https://github.com/mautrix/python/releases/tag/v${version}";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ nyanloutre ma27 sumnerevans nickcao ];
+    maintainers = with maintainers; [
+      nyanloutre
+      ma27
+      sumnerevans
+      nickcao
+    ];
   };
 }