From ebbdb1b6cf159ee8085f4953a36c30d643fae4c6 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 1 Dec 2025 09:05:07 +0000 Subject: [PATCH] python3Packages.wxpython: 4.2.3 -> 4.2.4 https://github.com/wxWidgets/Phoenix/blob/refs/tags/wxPython-4.2.4/CHANGES.rst https://github.com/wxWidgets/Phoenix/compare/refs/tags/wxPython-4.2.3...refs/tags/wxPython-4.2.4 --- .../development/python-modules/wxpython/4.2.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 68bee00914d6..8dfeb074c16b 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -4,11 +4,13 @@ buildPythonPackage, setuptools, fetchPypi, + fetchpatch, replaceVars, # build autoPatchelfHook, attrdict, + cython, doxygen, pkg-config, python, @@ -48,13 +50,12 @@ buildPythonPackage rec { pname = "wxpython"; - version = "4.2.3"; + version = "4.2.4"; format = "other"; src = fetchPypi { - pname = "wxPython"; - inherit version; - hash = "sha256-INbgySfifO2FZDcZvWPp9/1QHfbpqKqxSJsDmJf9fAE="; + inherit pname version; + hash = "sha256-LrEjl5yHvLMp6KJFImnWD/j59lHpvyXGdXnlPE67rjw="; }; patches = [ @@ -64,6 +65,13 @@ buildPythonPackage rec { libcairo = "${lib.getLib cairo}/lib/libcairo${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ./0001-add-missing-bool-c.patch # Add missing bool.c from old source + # TODO: drop when updating beyond version 4.2.4 + # https://github.com/wxWidgets/Phoenix/pull/2822 + (fetchpatch { + name = "Fix-wx.svg-to-work-with-cython-3.1-generated-code.patch"; + url = "https://github.com/wxWidgets/Phoenix/commit/31303649ab0a0fed0789e0951a7487d172b65bfa.patch"; + hash = "sha256-OAnAsyqHGPNEAiOxLLpdEGcd92K7TCxqEBYceuIb8so="; + }) ]; # https://github.com/wxWidgets/Phoenix/issues/2575 @@ -76,6 +84,7 @@ buildPythonPackage rec { nativeBuildInputs = [ attrdict + cython pkg-config requests setuptools