From ae18e3e998761659c485b7221a8949ed2a43480a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:58:01 +0200 Subject: [PATCH 1/2] python312Packages.wled: 0.17.1 -> 0.18.0 Diff: https://github.com/frenck/python-wled/compare/refs/tags/v0.17.1...v0.18.0 Changelog: https://github.com/frenck/python-wled/releases/tag/v0.18.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index c8eaedc38340..3dbdef76f1fb 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-9682AbcADhd9m5XrYeDFiX+sJCCe+pnuvntJDnpzJ+U="; + hash = "sha256-0BJgbyDhCPFlHxlEry7Rh/j0nv3D3kRhIqCSW+Irhqk="; }; postPatch = '' From 4e30caab80e639b961bfdad21c956507ff03f947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:03:42 +0200 Subject: [PATCH 2/2] python312Packages.wled: refactor - add optional-dependencies --- .../python-modules/wled/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3dbdef76f1fb..0836376c679d 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -1,24 +1,26 @@ { lib, aiohttp, + aresponses, awesomeversion, backoff, buildPythonPackage, cachetools, fetchFromGitHub, poetry-core, - yarl, - aresponses, pytest-asyncio, pytest-xdist, pytestCheckHook, pythonOlder, + typer, + yarl, + zeroconf, }: buildPythonPackage rec { pname = "wled"; version = "0.18.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -32,13 +34,13 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp awesomeversion backoff @@ -46,6 +48,13 @@ buildPythonPackage rec { yarl ]; + passthru.optional-dependencies = { + cli = [ + typer + zeroconf + ]; + }; + nativeCheckInputs = [ aresponses pytest-asyncio