From 1b8a657cc0d5911932eb6d7f3cb1edff9eaac19e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 20:30:34 +0000 Subject: [PATCH 1/4] python311Packages.crc: 6.1.2 -> 7.0.0 --- pkgs/development/python-modules/crc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 9540e9d315da..ebd1d5632f60 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "6.1.2"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = "crc"; rev = "refs/tags/${version}"; - hash = "sha256-d946yBMrOIgMXGOr2ej5bvn59D5iAGMese24qdv8l/Y="; + hash = "sha256-y30tnGG+G9dWBO8MUFYm2IGHiGIPbv4kB2VwhV0/C74="; }; nativeBuildInputs = [ From eca2e5722b9d045b927fb83d6dfd355bcd73bbe6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:34:53 +0200 Subject: [PATCH 2/4] python312Packages.crc: refactor --- pkgs/development/python-modules/crc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index ebd1d5632f60..c3983be0efef 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-y30tnGG+G9dWBO8MUFYm2IGHiGIPbv4kB2VwhV0/C74="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; @@ -37,11 +37,11 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; description = "Python module for calculating and verifying predefined & custom CRC's"; - mainProgram = "crc"; homepage = "https://nicoretti.github.io/crc/"; + changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ jleightcap ]; + mainProgram = "crc"; }; } From 10cf59f9a1897dcd5cd1725eeca52272d17a3756 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:35:16 +0200 Subject: [PATCH 3/4] python312Packages.crc: format with nixfmt --- .../python-modules/crc/default.nix | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index c3983be0efef..41452149eaff 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -20,21 +21,13 @@ buildPythonPackage rec { hash = "sha256-y30tnGG+G9dWBO8MUFYm2IGHiGIPbv4kB2VwhV0/C74="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "crc" - ]; + pythonImportsCheck = [ "crc" ]; - disabledTestPaths = [ - "test/bench" - ]; + disabledTestPaths = [ "test/bench" ]; meta = with lib; { description = "Python module for calculating and verifying predefined & custom CRC's"; From b34f1264706e1449e836de4b2a9d6bb8b76a90a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:38:44 +0200 Subject: [PATCH 4/4] python312Packages.zha: 0.0.5 -> 0.0.8 Changelog: https://github.com/zigpy/zha/releases/tag/0.0.8 --- pkgs/development/python-modules/zha/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 6e749edb9f25..d6d23f46611a 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.5"; + version = "0.0.8"; pyproject = true; disabled = pythonOlder "3.12"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-47dlWMzY1vPmHIDCy8a0xzk2G+OPq6vEK5OpP1c8vw4="; + hash = "sha256-xOaqwgL8NqB3pHNa6U/wextntI5aMivHLaIhSRqvgRU="; }; postPatch = '' @@ -49,8 +49,6 @@ buildPythonPackage rec { "zha-quirks" ]; - - nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -94,6 +92,7 @@ buildPythonPackage rec { "test_check_available_unsuccessful" "test_device_counter_sensors" "test_device_tracker" + "test_device_unavailable_skips_entity_polling" "test_elec_measurement_sensor_polling" "test_electrical_measurement_init" "test_group_member_assume_state"