From 9355dad97f74a341a6bbc8713de4f3409dee123c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:23:45 +0200 Subject: [PATCH 1/2] python311Packages.openhomedevice: refactor --- .../python-modules/openhomedevice/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 2e7ddf92a1d6..6c7a2ee856c1 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -6,23 +6,28 @@ , lxml , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "openhomedevice"; version = "2.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bazwilliams"; - repo = pname; + repo = "openhomedevice"; rev = "refs/tags/${version}"; hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ async-upnp-client lxml ]; From 3156917d2368103d117cc40b9d8c82dd6e77ab72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:24:08 +0200 Subject: [PATCH 2/2] python311Packages.openhomedevice: format with nixfmt --- .../python-modules/openhomedevice/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 6c7a2ee856c1..3c53f5f58322 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -1,12 +1,13 @@ -{ lib -, aioresponses -, async-upnp-client -, buildPythonPackage -, fetchFromGitHub -, lxml -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aioresponses, + async-upnp-client, + buildPythonPackage, + fetchFromGitHub, + lxml, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ async-upnp-client @@ -37,13 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "openhomedevice" - ]; + pythonImportsCheck = [ "openhomedevice" ]; - pytestFlagsArray = [ - "tests/*.py" - ]; + pytestFlagsArray = [ "tests/*.py" ]; meta = with lib; { description = "Python module to access Linn Ds and Openhome devices";