python-qt: 3.3.0 -> 3.4.2

`python-qt` v. 3.3.0 wasn't compatible with Python 3.11 yet
(it contained include statements for header files that were
removed by 3.11 [1] and used a python tuple field that was
replaced through a dedicated getter function [2]).

Switching to version 3.4.2 also means we can remove the
`remove-unneeded-pydebug-include.patch`, as it has since
been merged.

[1]: https://docs.python.org/3.11/whatsnew/3.11.html

> The non-limited API files cellobject.h, classobject.h, code.h, context.h,
> funcobject.h, genobject.h and longintrepr.h have been moved to the Include/cpython
> directory. Moreover, the eval.h header file was removed. These files must not be
> included directly, as they are already included in Python.h: Include Files.
> If they have been included directly, consider including Python.h instead.

[2]: https://github.com/python/cpython/issues/94936#issuecomment-1206497729
This commit is contained in:
Manuel Frischknecht 2023-12-06 23:59:48 +01:00
parent 6c01c5179a
commit 2a2327f508

View file

@ -4,28 +4,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "python-qt"; pname = "python-qt";
version = "3.3.0"; version = "3.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MeVisLab"; owner = "MeVisLab";
repo = "pythonqt"; repo = "pythonqt";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k="; hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0=";
}; };
patches = [
(fetchpatch {
name = "remove-unneeded-pydebug-include.patch";
url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch";
includes = [ "src/PythonQt.cpp" ];
hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0=";
})
];
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt
postPatch = '' postPatch = ''
substituteInPlace build/python.prf \ substituteInPlace build/python.prf \
--replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}" --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}"
''; '';
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];