diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix index f229e3325e99..614514bbfa3b 100644 --- a/pkgs/by-name/sm/smpmgr/package.nix +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -27,11 +27,14 @@ python3Packages.buildPythonApplication (finalAttrs: { "smpclient" ]; - dependencies = with python3Packages; [ - readchar - smpclient - typer - ]; + dependencies = + with python3Packages; + [ + readchar + smpclient + typer + ] + ++ smpclient.optional-dependencies.all; nativeCheckInputs = with python3Packages; [ pytestCheckHook diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix index 8ccfdc865738..cdae250e0a2a 100644 --- a/pkgs/development/python-modules/smp/default.nix +++ b/pkgs/development/python-modules/smp/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-dATsVGG0b5SBZh7R7NT1deJFDRYi7BwtWzT7/QPjkJw="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0"' 'version = "${version}"' + ''; + build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix index f5e44edb8469..f711cccca14f 100644 --- a/pkgs/development/python-modules/smpclient/default.nix +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -4,9 +4,9 @@ bleak, buildPythonPackage, fetchFromGitHub, + hatch-vcs, + hatchling, intelhex, - poetry-core, - poetry-dynamic-versioning, pyserial, pytest-asyncio, pytestCheckHook, @@ -15,38 +15,41 @@ buildPythonPackage rec { pname = "smpclient"; - version = "6.0.0"; + version = "7.0.1"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpclient"; tag = version; - hash = "sha256-1FyrJivP+sOKXVFuH5NbvIlOTOkuiUO3uIRasH8D+d8="; + hash = "sha256-5o2z+cyOVpTNpOdc9GfFNmqcOhbGgbFM0qGng44E1xE="; }; - pythonRelaxDeps = [ - "bleak" - "smp" - ]; + env.HATCH_BUILD_HOOK_VCS_VERSION = version; build-system = [ - poetry-core - poetry-dynamic-versioning + hatchling + hatch-vcs ]; dependencies = [ async-timeout - bleak intelhex - pyserial smp ]; + optional-dependencies = { + serial = [ pyserial ]; + ble = [ bleak ]; + udp = [ ]; + all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]); + }; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ]; + ] + ++ optional-dependencies.all; pythonImportsCheck = [ "smpclient" ];