diff --git a/pkgs/development/python-modules/deltachat2/default.nix b/pkgs/development/python-modules/deltachat2/default.nix index 806195e0bb71..6e274de00476 100644 --- a/pkgs/development/python-modules/deltachat2/default.nix +++ b/pkgs/development/python-modules/deltachat2/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + dacite, deltachat-rpc-server, setuptools-scm, replaceVars, @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "deltachat2"; - version = "0.10.0"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat2"; tag = version; - hash = "sha256-04MXh1p2xRRnvyu5GrPqMuaraP08WQbFzXYhkXRznA4="; + hash = "sha256-L2T1dUv7OCkAg6R5W1ukT/jEcSIkoLUVZmBhYxuPDCE="; }; patches = [ @@ -29,6 +30,10 @@ buildPythonPackage rec { setuptools-scm ]; + dependencies = [ + dacite + ]; + pythonImportsCheck = [ "deltachat2" ]; meta = { diff --git a/pkgs/development/python-modules/deltachat2/paths.patch b/pkgs/development/python-modules/deltachat2/paths.patch index 98c236ae4fc8..ace43ecf9776 100644 --- a/pkgs/development/python-modules/deltachat2/paths.patch +++ b/pkgs/development/python-modules/deltachat2/paths.patch @@ -1,13 +1,13 @@ diff --git a/deltachat2/transport.py b/deltachat2/transport.py -index c48827e..bfbc390 100644 +index c8b4a9c..a89994c 100644 --- a/deltachat2/transport.py +++ b/deltachat2/transport.py -@@ -71,7 +71,7 @@ class IOTransport: - # `process_group` is not supported before Python 3.11. - kwargs = {"preexec_fn": os.setpgrp, **self._kwargs} # noqa: PLW1509 - self.process = subprocess.Popen( # pylint:disable=consider-using-with -- "deltachat-rpc-server", -+ "@deltachatrpcserver@", - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - **kwargs, +@@ -44,7 +44,7 @@ class IOTransport: + def __init__( + self, + accounts_dir: Optional[str] = None, +- rpc_executable: str = "deltachat-rpc-server", ++ rpc_executable: str = "@deltachatrpcserver@", + **kwargs, + ): + """The given arguments will be passed to subprocess.Popen()"""