From 722c517b1dff3229c424c31cbf6c52986097f574 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:16:13 +0200 Subject: [PATCH 1/2] python312Packages.aioeagle: refactor --- .../python-modules/aioeagle/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix index 87f38ec71ea3..0426f22034a2 100644 --- a/pkgs/development/python-modules/aioeagle/default.nix +++ b/pkgs/development/python-modules/aioeagle/default.nix @@ -3,24 +3,29 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , xmltodict }: buildPythonPackage rec { pname = "aioeagle"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; - rev = version; - sha256 = "117nb50cxwrixif2r6fxmr9v0jxkcamm816v48hbhyc660w6xvk4"; + repo = "aioeagle"; + rev = "refs/tags/${version}"; + hash = "sha256-ZO5uODCGebggItsEVKtis0uwU67dmSxc7DHzzkBZ9oQ="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp xmltodict ]; @@ -28,7 +33,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aioeagle" ]; + pythonImportsCheck = [ + "aioeagle" + ]; meta = with lib; { description = "Python library to control EAGLE-200"; From 738e6665050fbd24e6d26ec410c56c7179b5f418 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:16:32 +0200 Subject: [PATCH 2/2] python312Packages.aioeagle: format with nixfmt --- .../python-modules/aioeagle/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix index 0426f22034a2..3c931fe69ef8 100644 --- a/pkgs/development/python-modules/aioeagle/default.nix +++ b/pkgs/development/python-modules/aioeagle/default.nix @@ -1,10 +1,11 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, xmltodict +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + xmltodict, }: buildPythonPackage rec { @@ -21,9 +22,7 @@ buildPythonPackage rec { hash = "sha256-ZO5uODCGebggItsEVKtis0uwU67dmSxc7DHzzkBZ9oQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -33,9 +32,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "aioeagle" - ]; + pythonImportsCheck = [ "aioeagle" ]; meta = with lib; { description = "Python library to control EAGLE-200";