From 4615f4dea24be56ccec141189ef2e043265940ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:40:44 +0200 Subject: [PATCH 1/2] python312Packages.aioeafm: refactor --- .../python-modules/aioeafm/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index f1535eb07d90..6f33e5ca4f94 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -5,24 +5,26 @@ , fetchpatch , poetry-core , pytest-aiohttp -, pytest-asyncio -, pytest-cov , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioeafm"; version = "1.0.0"; - format = "pyproject"; + pyproject =true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Jc2k"; - repo = pname; - rev = version; - sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; + repo = "aioeafm"; + rev = "refs/tags/${version}"; + hash = "sha256-bL59EPvFd5vjay2sqBPGx+iL5sE/0n/EtR4K7obtDBE="; }; patches = [ + # Switch to poetry-core, https://github.com/Jc2k/aioeafm/pull/4 (fetchpatch { name = "use-poetry-core.patch"; url = "https://github.com/Jc2k/aioeafm/commit/549590e2ed465be40e2406416d89b8a8cd8c6185.patch"; @@ -30,14 +32,12 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp - pytest-asyncio - pytest-cov pytestCheckHook ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for access the Real Time flood monitoring API"; homepage = "https://github.com/Jc2k/aioeafm"; + changelog = "https://github.com/Jc2k/aioeafm/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 06d8f3e3b8c8676adffb498b031b21a452a1c375 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:41:07 +0200 Subject: [PATCH 2/2] python312Packages.aioeafm: format with nixfmt --- .../python-modules/aioeafm/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index 6f33e5ca4f94..170ff6308f40 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pytest-aiohttp -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aioeafm"; version = "1.0.0"; - pyproject =true; + pyproject = true; disabled = pythonOlder "3.7";