From b5406e4961bfe9496104ee654889d30689326ba4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 09:53:26 +0200 Subject: [PATCH 1/2] python311Packages.kasa-crypt: init at 0.2.0 --- .../python-modules/kasa-crypt/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/kasa-crypt/default.nix diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix new file mode 100644 index 000000000000..ae208f61c663 --- /dev/null +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, pytestCheckHook +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kasa-crypt"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "kasa-crypt"; + rev = "refs/tags/v${version}"; + hash = "sha256-w/LA3BqxUcu1+nwq55g+v/QMhz8/uCTz2aRDYIdGPtk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=kasa_crypt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kasa_crypt" + ]; + + meta = with lib; { + description = "Fast kasa crypt"; + homepage = "https://github.com/bdraco/kasa-crypt"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6ae01f8bea8..4fee880c9147 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ self: super: with self; { karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { }; + kasa-crypt = callPackage ../development/python-modules/kasa-crypt { }; + kazoo = callPackage ../development/python-modules/kazoo { }; kbcstorage = callPackage ../development/python-modules/kbcstorage { }; From bb2a5aa9751b6e2fb1a59eb9169c91cb2181ba13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 09:55:15 +0200 Subject: [PATCH 2/2] python311Packages.sense-energy: 0.11.2 -> 0.12.0 Diff: https://github.com/scottbonline/sense/compare/refs/tags/0.11.2...0.12.0 Changelog: https://github.com/scottbonline/sense/releases/tag/0.12.0 --- pkgs/development/python-modules/sense-energy/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 61f1477c7c51..43836e882303 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , aiohttp , async-timeout +, kasa-crypt , orjson , pythonOlder , requests @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.2"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-i6XI6hiQTOGHB4KcDgz/MlYAhdEKaElLfNMq2R0fgu8="; + hash = "sha256-LVpTB7Q78N/cRbneJJ1aT+lFE790ssdMHo8VRirtDHY="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp async-timeout + kasa-crypt orjson requests websocket-client @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the Sense Energy Monitor"; homepage = "https://github.com/scottbonline/sense"; + changelog = "https://github.com/scottbonline/sense/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; };