From 0ddcba0ae4c20a5e2dd83e025c7879657fc7bd1d Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 6 Aug 2022 12:57:30 -0500 Subject: [PATCH] python3Packages.sip: add patch fixing QGIS breakage --- pkgs/development/python-modules/sip/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 3566be620e28..68052145766c 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }: buildPythonPackage rec { pname = "sip"; @@ -15,6 +15,13 @@ buildPythonPackage rec { # and PIP will refuse to install the resulting wheel. # remove once upstream fixes this, hopefully in 6.5.2 ./fix-manylinux-version.patch + + # fix issue triggered by QGIS 3.26.x, already fixed upstream + # in SIP, waiting for release past 6.6.2 + (fetchpatch { + url = "https://riverbankcomputing.com/hg/sip/raw-diff/323d39a2d602/sipbuild/generator/parser/instantiations.py"; + hash = "sha256-QEQuRzXA+wK9Dt22U/LgIwtherY9pJURGJYpKpJkiok="; + }) ]; propagatedBuildInputs = [ packaging ply toml ];