From bfc9cdc0efadf398566670a73d1f4d6e9af7cc54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Aug 2024 08:52:52 +0200 Subject: [PATCH 1/2] python312Packages.iso4217: 1.11 -> 1.12 Diff: https://github.com/dahlia/iso4217/compare/1.11...1.12 --- pkgs/development/python-modules/iso4217/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 718585c683c3..ca130c49a304 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.11"; + version = "1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-zJYtEIrsuHKPwnSoRjyZC/0rgAZoNMZ0Oh8gQcIb20Q="; + hash = "sha256-xOKfdk8Bn9f5oszS0IHUD6HgzL9VSa5GBZ28n4fvAck="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ importlib-resources ]; From de1555c8bfd6bc6626711f35eb1414a078357af7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Aug 2024 08:56:11 +0200 Subject: [PATCH 2/2] python312Packages.iso4217: refactor - update data source --- .../python-modules/iso4217/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index ca130c49a304..56945d3ed07a 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -7,29 +7,32 @@ pytestCheckHook, python, pythonOlder, + setuptools, }: let table = fetchurl { # See https://github.com/dahlia/iso4217/blob/main/setup.py#L19 - url = "http://www.currency-iso.org/dam/downloads/lists/list_one.xml"; - hash = "sha256-bp8uTMR1YRaI2cJLo0kdt9xD4nNaWK+LdlheWQ26qy0="; + url = "https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml"; + hash = "sha256-r1mRvI/qcOYOGKVzXHJGFdYxc+YlzpcdnWJExaF0Mp0="; }; in buildPythonPackage rec { pname = "iso4217"; version = "1.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dahlia"; - repo = pname; - rev = version; + repo = "iso4217"; + rev = "refs/tags/${version}"; hash = "sha256-xOKfdk8Bn9f5oszS0IHUD6HgzL9VSa5GBZ28n4fvAck="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + build-system = [ setuptools ]; + + dependencies = lib.optionals (pythonOlder "3.9") [ importlib-resources ]; nativeCheckInputs = [ pytestCheckHook ];