From 353b04e5f6494ae6c01af92b524326db89a492ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 09:14:31 +0200 Subject: [PATCH 1/3] python312Packages.pytrydan: 0.4.0 -> 0.6.0 Diff: https://github.com/dgomes/pytrydan/compare/refs/tags/v0.4.0...v0.6.0 Changelog: https://github.com/dgomes/pytrydan/blob/0.6.0/CHANGELOG.md --- pkgs/development/python-modules/pytrydan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index 5a191bf800fe..f405736cf9eb 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytrydan"; - version = "0.4.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = "pytrydan"; rev = "refs/tags/v${version}"; - hash = "sha256-9PyRICtZ+0Ezinu28oFgFOSnOyCmD7zZbdc/chN+sCo="; + hash = "sha256-+hFwBFYtRseVwesZtSrL3J/ZnsMAjD2ZAhTlk41hfqU="; }; postPatch = '' From bfa6d81029e5bb293762ec093d1fcb1e517f6481 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 09:15:47 +0200 Subject: [PATCH 2/3] python312Packages.pytrydan: refactor --- pkgs/development/python-modules/pytrydan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index f405736cf9eb..07139bdc4e82 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=pytrydan --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=pytrydan --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx orjson rich @@ -58,10 +58,10 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with V2C EVSE Trydan"; - mainProgram = "pytrydan"; homepage = "https://github.com/dgomes/pytrydan"; changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pytrydan"; }; } From 66d3e3b8eb1e10c27a1493f63f73166efcb25caa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 09:16:13 +0200 Subject: [PATCH 3/3] python312Packages.pytrydan: format witrh nixfmt --- .../python-modules/pytrydan/default.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index 07139bdc4e82..2a55b834ebb0 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, httpx -, orjson -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, respx -, rich -, syrupy -, tenacity -, typer +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httpx, + orjson, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, + rich, + syrupy, + tenacity, + typer, }: buildPythonPackage rec { @@ -33,9 +34,7 @@ buildPythonPackage rec { --replace-fail " --cov=pytrydan --cov-report=term-missing:skip-covered" "" ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ httpx @@ -52,9 +51,7 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "pytrydan" - ]; + pythonImportsCheck = [ "pytrydan" ]; meta = with lib; { description = "Library to interface with V2C EVSE Trydan";