From a4307a33c04135bbfc4b293c1683cc4203109443 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 15 Oct 2024 15:30:22 +0200 Subject: [PATCH] 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 ];