Merge pull request #217764 from dotlambda/sip-6.7.7

python310Packages.sip: 6.7.5 -> 6.7.7

pkgs/applications/misc/calibre/default.nix

@@ -58,8 +58,6 @@ stdenv.mkDerivation rec {
   prePatch = ''
     sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \
       setup/build.py
-    sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \
-      setup/build.py
 
     # Remove unneeded files and libs
     rm -rf src/odf resources/calibre-portable.*

pkgs/development/python-modules/sip/default.nix

@@ -1,34 +1,35 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, wheel
+, packaging
+, ply
+, toml
+}:
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "6.7.5";
+  version = "6.7.7";
+
+  format = "pyproject";
 
   src = fetchPypi {
-    pname = "sip";
-    inherit version;
-    sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ=";
+    inherit pname version;
+    hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
   propagatedBuildInputs = [ packaging ply toml ];
 
   # There aren't tests
   doCheck = false;
 
-  # FIXME: Why isn't this detected automatically?
-  # Needs to be specified in pyproject.toml, e.g.:
-  # [tool.sip.bindings.MODULE]
-  # tags = [PLATFORM_TAG]
-  platform_tag =
-    if stdenv.targetPlatform.isLinux then
-      "WS_X11"
-    else if stdenv.targetPlatform.isDarwin then
-      "WS_MACX"
-    else if stdenv.targetPlatform.isWindows then
-      "WS_WIN"
-    else
-      throw "unsupported platform";
-
   pythonImportsCheck = [ "sipbuild" ];
 
   meta = with lib; {