diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 57175d62e0e7b..c715c1fa3827d 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; @@ -104,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; }; } diff --git a/pkgs/by-name/ko/kohighlights/package.nix b/pkgs/by-name/ko/kohighlights/package.nix index 59e0094288bf7..b1b64f33e5045 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[@]} diff --git a/pkgs/by-name/pa/patray/package.nix b/pkgs/by-name/pa/patray/package.nix index b17928eec9caf..06a6a40fac0f3 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 diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 0605e31f57f72..c73584db7f5f6 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"; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/by-name/sl/sl1-to-photon/package.nix similarity index 85% rename from pkgs/applications/misc/sl1-to-photon/default.nix rename to pkgs/by-name/sl/sl1-to-photon/package.nix index 5c78d28b090ed..f763d9fcb90de 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/by-name/sl/sl1-to-photon/package.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 ad26088af183c..3fe074165e305 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 = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; - drone = callPackage ../development/tools/continuous-integration/drone { }; drone-oss = callPackage ../development/tools/continuous-integration/drone { enableUnfree = false; @@ -14687,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 { };