From 64c62a962af5c0925f1475c4f84c28718e3f147f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:12:14 -0700 Subject: [PATCH 1/8] rcu: use python312Packages Shiboken2, and thus pyside2, is broken on Python 3.13. --- pkgs/by-name/rc/rcu/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 0605e31f57f7..c73584db7f5f 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -13,11 +13,14 @@ makeDesktopItem, nettools, protobuf, - python3Packages, + python312Packages, system-config-printer, wget, }: +let + python3Packages = python312Packages; +in python3Packages.buildPythonApplication rec { pname = "rcu"; version = "4.0.24"; From 368f285bdb35dac6f8bb235c1358e17b1f315179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:15:10 -0700 Subject: [PATCH 2/8] patray: use python312 Shiboken2, and thus pyside2, is broken on Python 3.13. --- pkgs/by-name/pa/patray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patray/package.nix b/pkgs/by-name/pa/patray/package.nix index b17928eec9ca..06a6a40fac0f 100644 --- a/pkgs/by-name/pa/patray/package.nix +++ b/pkgs/by-name/pa/patray/package.nix @@ -1,11 +1,11 @@ { lib, - python3, + python312, fetchPypi, qt5, }: -python3.pkgs.buildPythonApplication rec { +python312.pkgs.buildPythonApplication rec { pname = "patray"; version = "0.1.2"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { sed -i '/pyside2/d' requirements/production.in ''; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python312.pkgs; [ pulsectl loguru cock From aa8b28389a301a1c239fedfcd94989b664846f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:18:46 -0700 Subject: [PATCH 3/8] sl1-to-photon: use python312Packages Shiboken2 is broken on Python 3.13. --- pkgs/applications/misc/sl1-to-photon/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index 5c78d28b090e..f763d9fcb90d 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -1,17 +1,12 @@ { lib, - buildPythonApplication, fetchFromGitHub, - pillow, - pyside2, - numpy, - pyphotonfile, - shiboken2, + python312Packages, }: let version = "0.1.3+"; in -buildPythonApplication rec { +python312Packages.buildPythonApplication rec { pname = "sl1-to-photon"; inherit version; @@ -22,7 +17,7 @@ buildPythonApplication rec { sha256 = "ssFfjlBMi3FHosDBUA2gs71VUIBkEdPVcV3STNxmOIM="; }; - pythonPath = [ + pythonPath = with python312Packages; [ pyphotonfile pillow numpy diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad26088af183..918e3cf05fd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2823,7 +2823,7 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; + sl1-to-photon = callPackage ../applications/misc/sl1-to-photon { }; drone = callPackage ../development/tools/continuous-integration/drone { }; drone-oss = callPackage ../development/tools/continuous-integration/drone { From b513b2a6e67e50d1555047cf6171d638468e7c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:19:39 -0700 Subject: [PATCH 4/8] sl1-to-photon: move to pkgs/by-name --- .../default.nix => by-name/sl/sl1-to-photon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/sl1-to-photon/default.nix => by-name/sl/sl1-to-photon/package.nix} (100%) diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/by-name/sl/sl1-to-photon/package.nix similarity index 100% rename from pkgs/applications/misc/sl1-to-photon/default.nix rename to pkgs/by-name/sl/sl1-to-photon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 918e3cf05fd7..73c6de8f98c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2823,8 +2823,6 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - sl1-to-photon = callPackage ../applications/misc/sl1-to-photon { }; - drone = callPackage ../development/tools/continuous-integration/drone { }; drone-oss = callPackage ../development/tools/continuous-integration/drone { enableUnfree = false; From 71c373c41e6456dc4c0d76f95be3319f8b887ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:21:30 -0700 Subject: [PATCH 5/8] kohighlights: use python312Packages Shiboken2, and thus pyside2, is broken on Python 3.13. --- pkgs/by-name/ko/kohighlights/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/kohighlights/package.nix b/pkgs/by-name/ko/kohighlights/package.nix index 59e0094288bf..b1b64f33e504 100644 --- a/pkgs/by-name/ko/kohighlights/package.nix +++ b/pkgs/by-name/ko/kohighlights/package.nix @@ -2,14 +2,16 @@ stdenv, lib, fetchFromGitHub, - python3, - python3Packages, + python312Packages, qt5, makeWrapper, copyDesktopItems, makeDesktopItem, }: +let + python3Packages = python312Packages; +in python3Packages.buildPythonApplication rec { pname = "kohighlights"; version = "2.3.1.0"; @@ -65,7 +67,7 @@ python3Packages.buildPythonApplication rec { mkdir -p $out/bin $out/share/KoHighlights rm -rf docs screens cp -r * $out/share/KoHighlights - makeWrapper ${python3.interpreter} $out/bin/KoHighlights \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/KoHighlights \ --add-flags "$out/share/KoHighlights/main.py" \ --set PYTHONPATH "${python3Packages.makePythonPath dependencies}" \ ''${qtWrapperArgs[@]} From bf1a8fc6b49c0aa49664b07a5e2d003c15d00c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:26:54 -0700 Subject: [PATCH 6/8] natron: use python312 Shiboken2 is broken on Python 3.13. --- pkgs/applications/video/natron/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 57175d62e0e7..d00356168ce5 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -13,7 +13,7 @@ extra-cmake-modules, glog, libXdmcp, - python3, + python312, wayland, }: @@ -26,6 +26,7 @@ let rev = "Natron-v${minorVersion}"; hash = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc="; }; + python3 = python312; in stdenv.mkDerivation { inherit version; From 1358736bcb35cd8e1cd3222976be3841657b66cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:32:36 -0700 Subject: [PATCH 7/8] natron: mark broken --- pkgs/applications/video/natron/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index d00356168ce5..c715c1fa3827 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; - broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; + # error: 'LogMessageVoidify' is not a member of 'google' + broken = true; }; } From 899493a396b127326cceb33db93345ebb932c7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Jun 2025 13:40:10 -0700 Subject: [PATCH 8/8] napari: use python312Packages Shiboken2, and thus magicgui, is broken on Python 3.13. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73c6de8f98c3..3fe074165e30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14685,7 +14685,7 @@ with pkgs; ledger-agent = with python3Packages; toPythonApplication ledger-agent; - napari = with python3Packages; toPythonApplication napari; + napari = with python312Packages; toPythonApplication napari; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };