diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 77660982bcaf..48df41452ef1 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -1,49 +1,50 @@ { lib, buildPythonPackage, - dateparser, fetchFromGitHub, - haversine, - pytestCheckHook, - pythonOlder, - requests, + + # build-system setuptools, + + # dependencies + haversine, + python-dateutil, + requests, xmltodict, + + # testing + pytestCheckHook, }: buildPythonPackage rec { pname = "georss-client"; - version = "0.18"; + version = "0.19"; pyproject = true; - - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; tag = "v${version}"; - hash = "sha256-KtndXsNvmjSGwqfKqkGAimHbapIC3I0yi4JuDh6cMzs="; + hash = "sha256-+CmauNb+5mDbZXQCd8ZxZCz6FSfEPAnktkMjvQueiO0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ haversine - xmltodict + python-dateutil requests - dateparser + xmltodict ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "georss_client" ]; - meta = with lib; { - broken = lib.versionAtLeast xmltodict.version "1"; + meta = { 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 ]; }; } 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 ]; }; } 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 }; }