From 003b5ac29b2a6a54344db1108221ae8a6898f54d Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 21 Oct 2025 15:38:03 -0700 Subject: [PATCH 1/3] python3Packages.aiolifx: modernize derivation --- pkgs/development/python-modules/aiolifx/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 3818ad68ef14..bd5d5e776fbb 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -7,7 +7,6 @@ fetchPypi, ifaddr, inquirerpy, - pythonOlder, setuptools, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-h82KPrHcWUUrQFyMy3fY6BmQFA5a4DFJdhJ6zRnKMsc="; @@ -38,12 +35,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiolifx" ]; - meta = with lib; { + meta = { description = "Module for local communication with LIFX devices over a LAN"; homepage = "https://github.com/aiolifx/aiolifx"; changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ netixx ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ netixx ]; mainProgram = "aiolifx"; }; } From 20ef37577ce56303b370b0e134b270d00fb78db9 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 21 Oct 2025 15:40:45 -0700 Subject: [PATCH 2/3] python3Packages.aiolifx: build from GitHub source --- pkgs/development/python-modules/aiolifx/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index bd5d5e776fbb..d1cc221a239e 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -4,7 +4,7 @@ bitstring, buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, ifaddr, inquirerpy, setuptools, @@ -15,9 +15,11 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-h82KPrHcWUUrQFyMy3fY6BmQFA5a4DFJdhJ6zRnKMsc="; + src = fetchFromGitHub { + owner = "aiolifx"; + repo = "aiolifx"; + tag = version; + hash = "sha256-9FTsY/VFfzLlDEjF8ueBQxr30YasdQwei1/KfHiXwMo="; }; build-system = [ setuptools ]; From b87416ff95465c54ee87f977e2b48deb5d26b67a Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 21 Oct 2025 15:45:01 -0700 Subject: [PATCH 3/3] python3Packages.aiolifx: allow click 8.2.x --- pkgs/development/python-modules/aiolifx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index d1cc221a239e..d1525f12f6a1 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "click" ]; + dependencies = [ async-timeout bitstring