From 2d5119986466a579f138ef560130fb28fe14a233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Jan 2026 07:56:21 -0800 Subject: [PATCH] python3Packages.xsdata: 25.7 -> 26.1 Diff: https://github.com/tefra/xsdata/compare/v25.7...v26.1 Changelog: https://github.com/tefra/xsdata/blob/v26.1/CHANGES.md --- .../python-modules/xsdata/default.nix | 12 +++------ .../python-modules/xsdata/paths.patch | 25 ++++++++++--------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index e991b6549619..ad02c2a20961 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -5,8 +5,6 @@ replaceVars, ruff, click, - click-default-group, - docformatter, jinja2, toposort, typing-extensions, @@ -18,14 +16,14 @@ buildPythonPackage rec { pname = "xsdata"; - version = "25.7"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; tag = "v${version}"; - hash = "sha256-npwJlyUYjoYzvwaZZK4PIqhJmTeYGDDfc4T4/ODcx4c="; + hash = "sha256-cMXLRk74y+yHYyIQqlUcMZawNfMXa5L17qhVkTpgEsk="; }; patches = [ @@ -46,8 +44,6 @@ buildPythonPackage rec { optional-dependencies = { cli = [ click - click-default-group - docformatter jinja2 toposort ]; @@ -58,9 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] - ++ optional-dependencies.cli - ++ optional-dependencies.lxml - ++ optional-dependencies.soap; + ++ lib.concatAttrValues optional-dependencies; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/xsdata/paths.patch b/pkgs/development/python-modules/xsdata/paths.patch index d80383fa31c8..9e63714eb185 100644 --- a/pkgs/development/python-modules/xsdata/paths.patch +++ b/pkgs/development/python-modules/xsdata/paths.patch @@ -1,21 +1,22 @@ diff --git a/xsdata/formats/dataclass/generator.py b/xsdata/formats/dataclass/generator.py -index f30196b1..b7934b3d 100644 +index b9f1b0e9..c1ed4c72 100644 --- a/xsdata/formats/dataclass/generator.py +++ b/xsdata/formats/dataclass/generator.py -@@ -240,14 +240,14 @@ class DataclassGenerator(AbstractGenerator): - """ +@@ -240,7 +240,7 @@ class DataclassGenerator(AbstractGenerator): + ruff_config = Path(__file__).parent.joinpath("ruff.toml") commands = [ [ - "ruff", -+ "@ruff@", - "format", - "--config", - f"line-length={self.config.output.max_line_length}", - *file_paths, - ], - [ -- "ruff", + "@ruff@", "check", "--config", - f"line-length={self.config.output.max_line_length}", + str(ruff_config), +@@ -252,7 +252,7 @@ class DataclassGenerator(AbstractGenerator): + *file_paths, + ], + [ +- "ruff", ++ "@ruff@", + "format", + "--config", + str(ruff_config),