From 283870293fcbca04058bf3a92518db61bf17182d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Oct 2024 21:45:04 +0000 Subject: [PATCH 1/3] python312Packages.xml2rfc: 3.23.1 -> 3.23.2 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index db7c59df4c1c..34dc6116a3f1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.23.1"; + version = "3.23.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-8AtQxLOOgEKhkbza9YwXrZVh/++UeJq8n8a7VwIzHSc="; + hash = "sha256-KL3kIntydUAOS7qGq6ZDrShEcyME1Qwf2VjM/9mw96Q="; }; postPatch = '' From cb7699b09b392c606eb5fe81a4f7738ed62645da Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 6 Oct 2024 15:48:58 +0900 Subject: [PATCH 2/3] python312Packages.xml2rfc: switch to pypa builder --- pkgs/development/python-modules/xml2rfc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 34dc6116a3f1..84129e8a27d4 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,14 @@ pythonOlder, pyyaml, requests, + setuptools, wcwidth, }: buildPythonPackage rec { pname = "xml2rfc"; version = "3.23.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +46,11 @@ buildPythonPackage rec { --replace-fail "test flaketest" "test" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "lxml" ]; + + dependencies = [ appdirs configargparse dict2xml From 7c0d61b1bb2376a16b2b8cfc423e43600943455b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 6 Oct 2024 15:49:26 +0900 Subject: [PATCH 3/3] python312Packages.xml2rfc: clean up dependencies --- pkgs/development/python-modules/xml2rfc/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 84129e8a27d4..8f6dd390ad7a 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,22 +1,18 @@ { lib, - appdirs, buildPythonPackage, configargparse, decorator, dict2xml, fetchFromGitHub, google-i18n-address, - html5lib, intervaltree, jinja2, lxml, - markupsafe, platformdirs, pycairo, pycountry, - pyflakes, - pypdf2, + pypdf, pytestCheckHook, python-fontconfig, pythonOlder, @@ -51,19 +47,15 @@ buildPythonPackage rec { pythonRelaxDeps = [ "lxml" ]; dependencies = [ - appdirs configargparse dict2xml google-i18n-address - html5lib intervaltree jinja2 lxml - markupsafe platformdirs pycountry - pyflakes - pypdf2 + pypdf pyyaml requests wcwidth