From 3dd9929761230a0359b4d3ec0d3517d4d02dd4db Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 21 Nov 2025 10:22:52 -0800 Subject: [PATCH 1/4] python3Packages.georss-client: modernize --- .../python-modules/georss-client/default.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 77660982bcaf..3f82bec578e0 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -1,14 +1,19 @@ { lib, buildPythonPackage, - dateparser, fetchFromGitHub, - haversine, - pytestCheckHook, - pythonOlder, - requests, + + # build-system setuptools, + + # dependencies + dateparser, + haversine, + requests, xmltodict, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -16,8 +21,6 @@ buildPythonPackage rec { version = "0.18"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; @@ -25,25 +28,25 @@ buildPythonPackage rec { hash = "sha256-KtndXsNvmjSGwqfKqkGAimHbapIC3I0yi4JuDh6cMzs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - haversine - xmltodict - requests + dependencies = [ dateparser + haversine + requests + xmltodict ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "georss_client" ]; - meta = with lib; { + meta = { broken = lib.versionAtLeast xmltodict.version "1"; description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-georss-client"; changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/${src.tag}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; }; } From f4eea1d87cee11a20be99b6b9efd5f116d1f5332 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 21 Nov 2025 10:17:42 -0800 Subject: [PATCH 2/4] python3Packages.georss-client: 0.18 -> 0.19 CHANGELOG: https://github.com/exxamalte/python-georss-client/releases/tag/v0.19 DIFF: https://github.com/exxamalte/python-georss-client/compare/v0.18...v0.19 --- .../python-modules/georss-client/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 3f82bec578e0..48df41452ef1 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -7,32 +7,31 @@ setuptools, # dependencies - dateparser, haversine, + python-dateutil, requests, xmltodict, - # tests + # testing pytestCheckHook, }: buildPythonPackage rec { pname = "georss-client"; - version = "0.18"; + version = "0.19"; pyproject = true; - src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; tag = "v${version}"; - hash = "sha256-KtndXsNvmjSGwqfKqkGAimHbapIC3I0yi4JuDh6cMzs="; + hash = "sha256-+CmauNb+5mDbZXQCd8ZxZCz6FSfEPAnktkMjvQueiO0="; }; build-system = [ setuptools ]; dependencies = [ - dateparser haversine + python-dateutil requests xmltodict ]; @@ -42,7 +41,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "georss_client" ]; meta = { - broken = lib.versionAtLeast xmltodict.version "1"; description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-georss-client"; changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/${src.tag}"; From 9a81fd6508416b718a12a368645ad310a1631949 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 21 Nov 2025 11:04:17 -0800 Subject: [PATCH 3/4] python3Packages.georss-ign-sismologia-client: modernize --- .../georss-ign-sismologia-client/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index bacaacad9ff8..a8f75b61cd65 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, georss-client, pytestCheckHook, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.8"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; @@ -23,9 +20,9 @@ buildPythonPackage rec { hash = "sha256-geIxF4GumxRoetJ6mIZCzI3pAvWjJJoY66aQYd2Mzik="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dateparser georss-client ]; @@ -34,11 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "georss_ign_sismologia_client" ]; - meta = with lib; { + meta = { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; homepage = "https://github.com/exxamalte/python-georss-ign-sismologia-client"; - changelog = "https://github.com/exxamalte/python-georss-ign-sismologia-client/blob/v0.6/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/exxamalte/python-georss-ign-sismologia-client/blob/${src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; }; } From f8d34efc6d53e772bbeaf64379bfb2a6ac279c59 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 21 Nov 2025 11:15:00 -0800 Subject: [PATCH 4/4] python3Packages.georss-ingv-centro-nazionale-terremoti-client: mark as broken Sends an incompatible format to georss_client.xml_parser --- .../georss-ingv-centro-nazionale-terremoti-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index 18cffa618f73..d94fbbdf7a66 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -36,5 +36,6 @@ buildPythonPackage rec { changelog = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + broken = true; # Sends a dict to georss_client.xml_parser which expects a string or character stream }; }