From 721a9ed6fd8ae98395bf1cd679edf0ff733c801b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:12:43 +0100 Subject: [PATCH 1/9] python310Packages.aio-geojson-nsw-rfs-incidents: add changelog to meta --- .../python-modules/aio-geojson-nsw-rfs-incidents/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 00ebe2c1f8fb..750d211ac2dc 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; - rev = "v${version}"; - sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From d548302b700ce9e9d62e83fdb29abb03d352da55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:15:20 +0100 Subject: [PATCH 2/9] python310Packages.geojson-client: add changelog to meta --- pkgs/development/python-modules/geojson-client/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix index 931c7c2917e0..f315d99d8dd8 100644 --- a/pkgs/development/python-modules/geojson-client/default.nix +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; - rev = "v${version}"; - sha256 = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-geojson-client"; + changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 6eb9bb4fe5c188455b42bb798dc9bfbe8f6a1ec1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:16:37 +0100 Subject: [PATCH 3/9] python310Packages.aio-geojson-client: 0.17 -> 0.18 Changelog: https://github.com/exxamalte/python-aio-geojson-client/blob/v0.18/CHANGELOG.md --- .../python-modules/aio-geojson-client/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index ce133a5f015d..ad0a641c35f5 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -3,7 +3,6 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , geojson , haversine , mock @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.17"; + version = "0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "refs/tags/v${version}"; - hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; + hash = "sha256-nvfy1XLiMjyCiQo/YuzRbDtxGmAUAiq8UJwS/SkN3oM="; }; - 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 From 9aa263b292544501c3c52ee6003dc965bd0a69ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:16:55 +0100 Subject: [PATCH 4/9] python310Packages.aio-geojson-nsw-rfs-incidents: 0.5 -> 0.6 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v0.6/CHANGELOG.md --- .../aio-geojson-nsw-rfs-incidents/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 750d211ac2dc..b7c205179fd7 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.5"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "refs/tags/v${version}"; - hash = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; + hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; }; propagatedBuildInputs = [ @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; From baeaaac31a09dd34c69703d833fcbeb7a1a1ccc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:18:49 +0100 Subject: [PATCH 5/9] python310Packages.aio-geojson-geonetnz-volcano: 0.7 -> 0.8 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v0.8/CHANGELOG.md --- .../aio-geojson-geonetnz-volcano/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 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 ad213243925d..3b61a49a4e5f 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -5,7 +5,6 @@ , mock , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytestCheckHook , pytz @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; + sha256 = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; }; - 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 From bf05c5a4c2fddb10746804f7e82af611f69cce0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:21:26 +0100 Subject: [PATCH 6/9] python310Packages.aio-geojson-generic-client: add changelog to meta --- .../python-modules/aio-geojson-generic-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 1e8666de68b7..534e8441e77a 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 8442b1aaa14e1511dc867e96953614d73635afa0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:23:35 +0100 Subject: [PATCH 7/9] python310Packages.aio-geojson-usgs-earthquakes: add changelog to meta --- .../python-modules/aio-geojson-usgs-earthquakes/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 025e0c356847..04ffcf6b384d 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 7df6cac08bd8648c63a755e481fa594401b16dd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:26:04 +0100 Subject: [PATCH 8/9] python310Packages.aio-geojson-geonetnz-quakes: add changelog to meta --- .../python-modules/aio-geojson-geonetnz-quakes/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index 53c72319af26..34e2947ab799 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; }; @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 39662cbf40fafbc4a3bcb796e6c79b360a83a3c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 10:26:45 +0100 Subject: [PATCH 9/9] python310Packages.aio-geojson-geonetnz-quakes: 0.14 -> 0.15 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v0.15/CHANGELOG.md --- .../python-modules/aio-geojson-geonetnz-quakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index 34e2947ab799..90645327c046 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.14"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "refs/tags/v${version}"; - hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; + hash = "sha256-/EPPEGLtiZBorZMnVg0NqwnHCbCXyZzz4449MzAYQx8="; }; propagatedBuildInputs = [