From 4574fd47dc317fa41dbf45891bf614d210c4183b Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 16:24:35 -0400 Subject: [PATCH 1/3] python3Packages.vilfo-api-client: migrate to pyproject --- .../python-modules/vilfo-api-client/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index e0cda56a9349..3ae3bde09573 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -8,12 +8,13 @@ semver, pytestCheckHook, responses, + setuptools, }: buildPythonPackage rec { pname = "vilfo-api-client"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ManneW"; @@ -22,14 +23,17 @@ buildPythonPackage rec { hash = "sha256-ZlmriBd+M+54ux/UNYa355mkz808/NxSz7IzmWouA0c="; }; + build-system = [ + setuptools + setuptools-scm + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "get-mac" "getmac" ''; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ + dependencies = [ getmac requests semver From f80c1dc8f4f46095cc693e1241e6c810c974b835 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 16:25:38 -0400 Subject: [PATCH 2/3] python3Packages.vilfo-api-client: modernize --- .../python-modules/vilfo-api-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 3ae3bde09573..0485acdd5274 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vilfo-api-client"; version = "0.5.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManneW"; repo = "vilfo-api-client-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZlmriBd+M+54ux/UNYa355mkz808/NxSz7IzmWouA0c="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "get-mac" "getmac" + --replace-fail "get-mac" "getmac" ''; dependencies = [ @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From 67c5d9ba351f12307a686504a78e40919204628c Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 16:25:59 -0400 Subject: [PATCH 3/3] python3Packages.vilfo-api-client: add changelog --- pkgs/development/python-modules/vilfo-api-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 0485acdd5274..5c4ac4ebd0f6 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -49,6 +49,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Simple wrapper client for the Vilfo router API"; homepage = "https://github.com/ManneW/vilfo-api-client-python"; + changelog = "https://github.com/ManneW/vilfo-api-client-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; };