From 8b44dca9e66a6913d7e989484a71b2ff7f07009a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Nov 2023 11:01:15 +0000 Subject: [PATCH 1/2] python311Packages.pycontrol4: 1.1.0 -> 1.1.2 --- pkgs/development/python-modules/pycontrol4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 5719e7640631..ab8c18de1819 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "1.1.0"; + version = "1.1.2"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lawtancool"; repo = "pyControl4"; - rev = "v${version}"; - hash = "sha256-dMv2b6dbMauPvPf4LHKmLF4jnXYRYe6A+2lDtiZDUhY="; + rev = "refs/tags/v${version}"; + hash = "sha256-oKKc9s3/fO7cFMjOeKtpvEwmfglxI2lxlN3EIva7zR8="; }; postPatch = '' From 8ce8a58d8fbe6b7d37a693051a2bd5f42685b1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Nov 2023 11:46:30 -0800 Subject: [PATCH 2/2] python311Packages.pycontrol4: use pyproject --- pkgs/development/python-modules/pycontrol4/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index ab8c18de1819..e45c448bba0f 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , aiohttp , xmltodict , python-socketio @@ -14,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lawtancool"; @@ -28,6 +29,10 @@ buildPythonPackage rec { --replace "python-socketio>=4,<5" "python-socketio>=4" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp xmltodict