From 338783ee64a7fdfbb2e4ad5ae19ea1916b5729e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Jan 2025 15:47:52 +0100 Subject: [PATCH] python313Packages.breathe: 4.35.0 -> 4.35.0-unstable-2025-01-16 Fast-forward for sphinx 7.4 compat, for which the patch did not apply cleanly. --- .../python-modules/breathe/default.nix | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 3a39611873ce..d09fbe37c004 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,42 +2,28 @@ lib, buildPythonPackage, defusedxml, + flit-core, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, - setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage { pname = "breathe"; - version = "4.35.0"; + version = "4.35.0-unstable-2025-01-16"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "breathe-doc"; repo = "breathe"; - tag = "v${version}"; - hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; + rev = "9711e826e0c46a635715e5814a83cab9dda79b7b"; # 4.35.0 lacks sphinx 7.2+ compat + hash = "sha256-Ie+8RLWeBgbC4s3TC6ege2YNdfdM0d906BPxB7EOwq8="; }; - patches = [ - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/964 - (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/caa8dc45222b35d360c24bf36835a7d8e6d86df2.patch"; - hash = "sha256-wWe4x4WwZTrDhNZAF7mhfHHNEjd+Kp4YXghL+DPa10w="; - }) - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/976 - (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/09c856bf72de41e82582f31855e916295ba6d382.patch"; - hash = "sha256-vU3DUrj4Jj4AUolFFtWmaLMf9RG7TmKqJe5sCwwRjPI="; - }) - ]; - - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ sphinx ]; @@ -46,11 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # tests fail with sphinx 7.4.x - "tests/test_renderer.py" - ]; - pythonImportsCheck = [ "breathe" ]; meta = {