From 094062727293b987affec3cee5cf10787c45234c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:46:25 +0100 Subject: [PATCH 1/3] python310Packages.aio-geojson-client: add changelog to meta --- pkgs/development/python-modules/aio-geojson-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index b0629483d014..a7796367b8b0 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 8f12f5e1d34a6632e08b82ef8fe72959bd586993 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:49:37 +0100 Subject: [PATCH 2/3] python311Packages.aio-geojson-client: remove asynctest --- .../python-modules/aio-geojson-client/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index a7796367b8b0..a23b41b66396 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -1,11 +1,12 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub +, fetchpatch , geojson , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; + patches = [ + # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-client/pull/35 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/exxamalte/python-aio-geojson-client/commit/bf617d9898a99b026b43b28bd87bb6479f518c0a.patch"; + hash = "sha256-uomH3LCaklfGURDs8SsnvNyHkubbe+5dleLEjW+I+M4="; + }) + ]; + propagatedBuildInputs = [ aiohttp geojson @@ -33,7 +43,7 @@ buildPythonPackage rec { checkInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; From a6346f68da8159fcdde507b47de1a7170e90b6ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 13:04:35 +0100 Subject: [PATCH 3/3] python311Packages.aio-geojson-geonetnz-volcano: remove asynctest --- .../aio-geojson-geonetnz-volcano/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3ba2b430801e..618735527ae8 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -2,9 +2,10 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest +, mock , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pytz @@ -21,10 +22,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; }; + patches = [ + # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/pull/18 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/commit/d04a488130375c78efa541fd63a5d88bd6b0fd49.patch"; + hash = "sha256-ArG8CovJckzzNebd03WeU5i/jPqy2HRVBL3ICk5nZ5Y="; + }) + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -33,7 +43,7 @@ buildPythonPackage rec { checkInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; };