diff --git a/pkgs/development/python-modules/dlms-cosem/default.nix b/pkgs/development/python-modules/dlms-cosem/default.nix new file mode 100644 index 000000000000..e6040fb7860a --- /dev/null +++ b/pkgs/development/python-modules/dlms-cosem/default.nix @@ -0,0 +1,51 @@ +{ lib +, asn1crypto +, attrs +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pyserial +, pytestCheckHook +, python-dateutil +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dlms-cosem"; + version = "21.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pwitab"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I="; + }; + + propagatedBuildInputs = [ + asn1crypto + attrs + cryptography + pyserial + python-dateutil + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dlms_cosem" + ]; + + meta = with lib; { + description = "Python module to parse DLMS/COSEM"; + homepage = "https://github.com/pwitab/dlms-cosem"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index c91677710817..883ea432cd22 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dlms-cosem , fetchFromGitHub , pyserial , pyserial-asyncio @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.33"; + version = "0.34"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,10 +21,11 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "v${version}"; - sha256 = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w="; + sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io="; }; propagatedBuildInputs = [ + dlms-cosem pyserial pyserial-asyncio pytz diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04c9ec2047cb..c4714ffe9a52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2620,6 +2620,8 @@ self: super: with self; { dlinfo = callPackage ../development/python-modules/dlinfo { }; + dlms-cosem = callPackage ../development/python-modules/dlms-cosem { }; + dlx = callPackage ../development/python-modules/dlx { }; dmenu-python = callPackage ../development/python-modules/dmenu { };