Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/applications/video/natron/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
extra-cmake-modules,
glog,
libXdmcp,
python3,
python312,
wayland,
}:

Expand All @@ -26,6 +26,7 @@ let
rev = "Natron-v${minorVersion}";
hash = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc=";
};
python3 = python312;
in
stdenv.mkDerivation {
inherit version;
Expand Down Expand Up @@ -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;
};
}
8 changes: 5 additions & 3 deletions pkgs/by-name/ko/kohighlights/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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[@]}
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/pa/patray/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
lib,
python3,
python312,
fetchPypi,
qt5,
}:

python3.pkgs.buildPythonApplication rec {
python312.pkgs.buildPythonApplication rec {
pname = "patray";
version = "0.1.2";

Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion pkgs/by-name/rc/rcu/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -22,7 +17,7 @@ buildPythonApplication rec {
sha256 = "ssFfjlBMi3FHosDBUA2gs71VUIBkEdPVcV3STNxmOIM=";
};

pythonPath = [
pythonPath = with python312Packages; [
pyphotonfile
pillow
numpy
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 { };

Expand Down