From 2e9100bd3bc2436a8301519a2b0bc5de88c3227a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Jan 2024 13:46:58 +0100 Subject: [PATCH 1/2] python311Packages.pykoplenti: refactor --- .../python-modules/pykoplenti/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 99f90e17b028..6e2be0f73672 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pykoplenti"; version = "1.2.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stegm"; - repo = pname; + repo = "pykoplenti"; rev = "refs/tags/v${version}"; hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; @@ -28,12 +28,6 @@ buildPythonPackage rec { setuptools ]; - postPatch = '' - # remove with 1.1.0 - substituteInPlace setup.cfg \ - --replace 'version = unreleased' 'version = ${version}' - ''; - propagatedBuildInputs = [ aiohttp pycryptodome @@ -50,11 +44,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pykoplenti" ]; + pythonImportsCheck = [ + "pykoplenti" + ]; meta = with lib; { description = "Python REST client API for Kostal Plenticore Inverters"; homepage = "https://github.com/stegm/pykoplenti/"; + changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 8f0942407592beff381344b56c7a693da1cad9ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Jan 2024 13:48:12 +0100 Subject: [PATCH 2/2] python311Packages.pykoplenti: relax pydantic --- pkgs/development/python-modules/pykoplenti/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 6e2be0f73672..a8930149b1bb 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -7,6 +7,7 @@ , pycryptodome , pydantic , pythonOlder +, pythonRelaxDepsHook , setuptools }: @@ -24,7 +25,12 @@ buildPythonPackage rec { hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ];