From 841b7851dc2193453c989d7b1f4a1e16740e3744 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 12 Jan 2025 19:28:08 +0800 Subject: [PATCH 1/2] python313Packages.finitude: fix build --- .../python-modules/finitude/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix index cf2e80928f06..6c4ddd2c8c0e 100644 --- a/pkgs/development/python-modules/finitude/default.nix +++ b/pkgs/development/python-modules/finitude/default.nix @@ -6,27 +6,29 @@ pyserial, pythonOlder, pyyaml, + legacy-cgi, setuptools, }: buildPythonPackage rec { pname = "finitude"; version = "0.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dulitz"; - repo = pname; - rev = "v${version}"; + repo = "finitude"; + tag = "v${version}"; hash = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyserial + legacy-cgi prometheus-client pyyaml ]; @@ -36,10 +38,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "finitude" ]; - meta = with lib; { + meta = { description = "Python module to get data from ABCD bus (RS-485) used by Carrier Infinity and Bryant Evolution HVAC systems"; homepage = "https://github.com/dulitz/finitude"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 8a080ce71d09293f154acad261c4e76d488cff49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Jan 2025 13:17:10 +0100 Subject: [PATCH 2/2] python313Packages.finitude: add changelog to meta --- pkgs/development/python-modules/finitude/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix index 6c4ddd2c8c0e..dbc2a6282c81 100644 --- a/pkgs/development/python-modules/finitude/default.nix +++ b/pkgs/development/python-modules/finitude/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = { description = "Python module to get data from ABCD bus (RS-485) used by Carrier Infinity and Bryant Evolution HVAC systems"; homepage = "https://github.com/dulitz/finitude"; + changelog = "https://github.com/dulitz/finitude/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; };