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] 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 {