From c8d738bbb30220ba44732dbfc4a694e705b6eafe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 16:17:10 +0000 Subject: [PATCH 1/3] python312Packages.python-roborock: 0.41.0 -> 1.0.0 --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index d874ec9c2a7a..6477393d0fd0 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.41.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Kh7u1UWqmfmxY6yWaBaUpe20Xc/DTryoymKgIYg/kiM="; + hash = "sha256-izstUq7ICFNJ9v8+uB7JeMuzmOazP22As5VKDinXemU="; }; postPatch = '' From e99d758c392b367e2bb52362ce3f46969b9fbda7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 19:02:46 +0200 Subject: [PATCH 2/3] python312Packages.python-roborock: refactor --- .../development/python-modules/python-roborock/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 6477393d0fd0..e3eaff2cffba 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -40,8 +40,11 @@ buildPythonPackage rec { "pycryptodome" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -68,10 +71,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum"; - mainProgram = "roborock"; homepage = "https://github.com/humbertogontijo/python-roborock"; changelog = "https://github.com/humbertogontijo/python-roborock/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "roborock"; }; } From b7ef007f7bdae7da1319b76e4ab237e5485239ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 19:03:04 +0200 Subject: [PATCH 3/3] python312Packages.python-roborock: format with nixfmt --- .../python-roborock/default.nix | 55 ++++++++----------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index e3eaff2cffba..0f82455c1266 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, aiohttp -, async-timeout -, buildPythonPackage -, click -, construct -, dacite -, fetchFromGitHub -, paho-mqtt -, poetry-core -, pycryptodome -, pycryptodomex -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + stdenv, + aiohttp, + async-timeout, + buildPythonPackage, + click, + construct, + dacite, + fetchFromGitHub, + paho-mqtt, + poetry-core, + pycryptodome, + pycryptodomex, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -36,17 +37,11 @@ buildPythonPackage rec { --replace "poetry-core==1.8.0" "poetry-core" ''; - pythonRelaxDeps = [ - "pycryptodome" - ]; + pythonRelaxDeps = [ "pycryptodome" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp @@ -56,18 +51,14 @@ buildPythonPackage rec { dacite paho-mqtt pycryptodome - ] ++ lib.optionals stdenv.isDarwin [ - pycryptodomex - ]; + ] ++ lib.optionals stdenv.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "roborock" - ]; + pythonImportsCheck = [ "roborock" ]; meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum";