From 6c627445817f092f4ebc1611b619c231510d7c0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Apr 2024 08:21:32 +0200 Subject: [PATCH 1/3] python312Packages.soco: refactor --- pkgs/development/python-modules/soco/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 41774ec79ee1..a61782fea39a 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,23 +1,24 @@ { lib +, appdirs , buildPythonPackage , fetchFromGitHub , graphviz -, appdirs , ifaddr -, pythonOlder , lxml , mock , nix-update-script , pytestCheckHook +, pythonOlder , requests , requests-mock +, setuptools , xmltodict }: buildPythonPackage rec { pname = "soco"; version = "0.30.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -28,7 +29,11 @@ buildPythonPackage rec { hash = "sha256-T5kZxwLtqdECuYNfI0z2kLuTPp8yuPsx+MQG27WUJYU="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ appdirs ifaddr lxml From a589919cb3949c24a0fc2c3c84d251a4d9098971 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Apr 2024 08:23:26 +0200 Subject: [PATCH 2/3] python312Packages.soco: 0.30.2 -> 0.30.3 Diff: https://github.com/SoCo/SoCo/compare/refs/tags/v0.30.2...v0.30.3 Changelog: https://github.com/SoCo/SoCo/releases/tag/v0.30.3 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index a61782fea39a..8d5cec693235 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.2"; + version = "0.30.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-T5kZxwLtqdECuYNfI0z2kLuTPp8yuPsx+MQG27WUJYU="; + hash = "sha256-QAF3f1JMGFFsgdZzoyo+RwKKMaLG+hy+lvZwCzceU/g="; }; build-system = [ From 4a4d98d961953fbb9b7d6313833e1cc69fb3b612 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Apr 2024 08:23:40 +0200 Subject: [PATCH 3/3] python312Packages.soco: format with nixfmt --- .../python-modules/soco/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 8d5cec693235..347273e453e6 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,18 +1,19 @@ -{ lib -, appdirs -, buildPythonPackage -, fetchFromGitHub -, graphviz -, ifaddr -, lxml -, mock -, nix-update-script -, pytestCheckHook -, pythonOlder -, requests -, requests-mock -, setuptools -, xmltodict +{ + lib, + appdirs, + buildPythonPackage, + fetchFromGitHub, + graphviz, + ifaddr, + lxml, + mock, + nix-update-script, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, + xmltodict, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { hash = "sha256-QAF3f1JMGFFsgdZzoyo+RwKKMaLG+hy+lvZwCzceU/g="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ appdirs @@ -48,9 +47,7 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ - "soco" - ]; + pythonImportsCheck = [ "soco" ]; passthru.updateScript = nix-update-script { };