From 907b79c3af1c5b09834666cadd3c69112cf2930e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 05:12:26 +0000 Subject: [PATCH 1/3] python311Packages.pytapo: 3.3.20 -> 3.3.21 --- pkgs/development/python-modules/pytapo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 50e4fe4a7d59..2b5d64660b19 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.20"; + version = "3.3.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lJ3+wGzbgvaB20KOGg3ncKb2XlcraFMk8oEK6newX/A="; + hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; propagatedBuildInputs = [ From 244a8de7ffd408082c9891c055d9c038899754d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:35:32 +0200 Subject: [PATCH 2/3] python312Packages.pytapo: refactor --- pkgs/development/python-modules/pytapo/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 2b5d64660b19..9de41fe5112b 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -2,18 +2,17 @@ , buildPythonPackage , fetchPypi , pythonOlder - -# propagates , pycryptodome , requests , rtp , urllib3 +, setuptools }: buildPythonPackage rec { pname = "pytapo"; version = "3.3.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pycryptodome requests rtp From 2ff878b4bed51bc0c9cc211c937c9b7fcefd09ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:35:48 +0200 Subject: [PATCH 3/3] python312Packages.pytapo: format with nixfmt --- .../python-modules/pytapo/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 9de41fe5112b..f61e7089f2d2 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pycryptodome -, requests -, rtp -, urllib3 -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pycryptodome, + requests, + rtp, + urllib3, + setuptools, }: buildPythonPackage rec { @@ -21,9 +22,7 @@ buildPythonPackage rec { hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pycryptodome @@ -32,9 +31,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "pytapo" - ]; + pythonImportsCheck = [ "pytapo" ]; # Tests require actual hardware doCheck = false;