diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 68052145766..ab2701fefdc 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,35 +2,19 @@ buildPythonPackage rec { pname = "sip"; - version = "6.6.2"; + version = "6.7.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-Dj76wcXf2OUlrlcUCSffJpk+E/WLidFXfDFPQQW/2Q0="; + sha256 = "sha256-KBcP34gPk3Am/If6qcF3sGLDU8XRaeoyQrB4AmFN3Qw="; }; - patches = [ - # on non-x86 Linux platforms, sip incorrectly detects the manylinux version - # 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 ]; # There aren't tests doCheck = false; - pythonImportsCheck = [ "sipbuild" ]; - # FIXME: Why isn't this detected automatically? # Needs to be specified in pyproject.toml, e.g.: # [tool.sip.bindings.MODULE] @@ -45,10 +29,12 @@ buildPythonPackage rec { else throw "unsupported platform"; + pythonImportsCheck = [ "sipbuild" ]; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "https://riverbankcomputing.com/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nrdxp ]; }; } diff --git a/pkgs/development/python-modules/sip/fix-manylinux-version.patch b/pkgs/development/python-modules/sip/fix-manylinux-version.patch deleted file mode 100644 index 4b8e99ae8e4..00000000000 --- a/pkgs/development/python-modules/sip/fix-manylinux-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/sipbuild/project.py b/sipbuild/project.py ---- a/sipbuild/project.py -+++ b/sipbuild/project.py -@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable): - # We expect a two part tag so leave anything else unchanged. - parts = platform_tag.split('-') - if len(parts) == 2: -- if self.minimum_glibc_version > (2, 17): -+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}: - # PEP 600. - parts[0] = 'manylinux' - parts.insert(1, - '{}.{}'.format(self.minimum_glibc_version[0], - self.minimum_glibc_version[1])) -- elif self.minimum_glibc_version > (2, 12): -+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}: - # PEP 599. - parts[0] = 'manylinux2014' - elif self.minimum_glibc_version > (2, 5):