From f595d4f2691c41ec8d036dca18c1822728c1e463 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Mar 2024 17:03:03 +0100 Subject: [PATCH 1/2] python311Packages.whirlpool-sixth-sense: refactor --- .../whirlpool-sixth-sense/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 47b90a4c7d44..2e774beee165 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -1,6 +1,7 @@ { lib , aioconsole , aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -14,24 +15,25 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; version = "0.18.7"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "abmantis"; - repo = pname; + repo = "whirlpool-sixth-sense"; rev = "refs/tags/${version}"; hash = "sha256-M4qOdxR97VhquB85IgimYKZqix2WoRIZcLSIlVK1xDY="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aioconsole aiohttp + async-timeout websockets ]; @@ -44,7 +46,9 @@ buildPythonPackage rec { # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 doCheck = false; - pythonImportsCheck = [ "whirlpool" ]; + pythonImportsCheck = [ + "whirlpool" + ]; meta = with lib; { description = "Python library for Whirlpool 6th Sense appliances"; From 17f8a37578754ec84fc97acef10cfef37476f51c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 20:19:21 +0200 Subject: [PATCH 2/2] python311Packages.whirlpool-sixth-sense: format with nixfmt --- .../whirlpool-sixth-sense/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 2e774beee165..5964244d391d 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -1,15 +1,16 @@ -{ lib -, aioconsole -, aiohttp -, async-timeout -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, websockets +{ + lib, + aioconsole, + aiohttp, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, + websockets, }: buildPythonPackage rec { @@ -26,9 +27,7 @@ buildPythonPackage rec { hash = "sha256-M4qOdxR97VhquB85IgimYKZqix2WoRIZcLSIlVK1xDY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aioconsole @@ -46,9 +45,7 @@ buildPythonPackage rec { # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 doCheck = false; - pythonImportsCheck = [ - "whirlpool" - ]; + pythonImportsCheck = [ "whirlpool" ]; meta = with lib; { description = "Python library for Whirlpool 6th Sense appliances";