From 94d72ed4ce234771e886f4259b0cae8ff518a364 Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik@strid.tech>
Date: Tue, 15 Oct 2024 08:21:55 +0200
Subject: [PATCH 1/3] python3Packages.sip: 6.8.3 -> 6.8.6

---
 pkgs/development/python-modules/sip/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 8a398654b08c..4b43a47266c1 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   pythonOlder,
   setuptools,
+  setuptools-scm,
   packaging,
   tomli,
 
@@ -15,15 +16,18 @@
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "6.8.3";
+  version = "6.8.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw=";
+    hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
 
   propagatedBuildInputs = [
     packaging

From 63eab14928dd8661c342e3904bdd4c8c23977090 Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik@strid.tech>
Date: Tue, 15 Oct 2024 08:22:21 +0200
Subject: [PATCH 2/3] python3Packages.pyqt6: 6.7.0.dev2404081550 -> 6.7.1

---
 pkgs/development/python-modules/pyqt/6.x.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 9f031347d354..408a9cc8e605 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchurl,
+  fetchPypi,
   pkg-config,
   dbus,
   lndir,
@@ -25,17 +25,15 @@
 
 buildPythonPackage rec {
   pname = "pyqt6";
-  version = "6.7.0.dev2404081550";
+  version = "6.7.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchurl {
-    urls = [
-      "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
-      "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
-    ];
-    hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ=";
+  src = fetchPypi {
+    pname = "PyQt6";
+    inherit version;
+    hash = "sha256-NnKoLM06YumasgChOQNCHiko45n9olztmNFAMTrVnLk=";
   };
 
   patches = [

From a4307a33c04135bbfc4b293c1683cc4203109443 Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik@strid.tech>
Date: Tue, 15 Oct 2024 15:30:22 +0200
Subject: [PATCH 3/3] python3Packages.pyqt6: 6.7.1 -> 6.8.0.dev2410141303

---
 pkgs/development/python-modules/pyqt/6.x.nix    | 17 ++++++++++-------
 pkgs/development/python-modules/sip/default.nix |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 408a9cc8e605..6356eeb9637f 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchurl,
   pkg-config,
   dbus,
   lndir,
@@ -25,15 +25,15 @@
 
 buildPythonPackage rec {
   pname = "pyqt6";
-  version = "6.7.1";
+  version = "6.8.0.dev2410141303";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    pname = "PyQt6";
-    inherit version;
-    hash = "sha256-NnKoLM06YumasgChOQNCHiko45n9olztmNFAMTrVnLk=";
+  # This is dangerous, how can we get web archive to archive the URL?
+  src = fetchurl {
+    url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz";
+    hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4=";
   };
 
   patches = [
@@ -53,8 +53,11 @@ buildPythonPackage rec {
     verbose = true
     EOF
 
+    # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK
     substituteInPlace pyproject.toml \
-      --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"'
+      --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \
+      --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \
+      --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 4b43a47266c1..8fd6240e4a51 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -24,12 +24,12 @@ buildPythonPackage rec {
     hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     packaging
     setuptools
   ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];