From 03ecfc4682421cc4f06c2db1ab3e8a1342de3831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Nov 2022 16:36:27 -0800 Subject: [PATCH 1/3] klipper-genconf: use python3 --- pkgs/servers/klipper/klipper-genconf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/klipper/klipper-genconf.nix b/pkgs/servers/klipper/klipper-genconf.nix index 42eb519e8c19..d810bccd4366 100644 --- a/pkgs/servers/klipper/klipper-genconf.nix +++ b/pkgs/servers/klipper/klipper-genconf.nix @@ -1,12 +1,12 @@ { writeShellApplication , klipper -, python2 +, python3 , gnumake , pkgsCross }: writeShellApplication { name = "klipper-genconf"; runtimeInputs = [ - python2 + python3 pkgsCross.avr.stdenv.cc gnumake ]; From 02677fc1e182a5d0611eea043265e9fdf5d54c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Nov 2022 16:40:52 -0800 Subject: [PATCH 2/3] klipper-firmware: use python3 only --- pkgs/servers/klipper/klipper-firmware.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix index 704a7310cb8c..3d37f91b11f6 100644 --- a/pkgs/servers/klipper/klipper-firmware.nix +++ b/pkgs/servers/klipper/klipper-firmware.nix @@ -6,7 +6,6 @@ , libffi , libusb1 , wxGTK30-gtk3 -, python2 , python3 , gcc-arm-embedded , klipper @@ -20,7 +19,6 @@ src = klipper.src; nativeBuildInputs = [ - python2 python3 pkgsCross.avr.stdenv.cc gcc-arm-embedded From 1c9df7e848341fe52f4bce80f945f5073425e14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Nov 2022 16:41:16 -0800 Subject: [PATCH 3/3] klipper-flash: use python3 --- pkgs/servers/klipper/klipper-flash.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/klipper/klipper-flash.nix b/pkgs/servers/klipper/klipper-flash.nix index fedc477c2761..2f37745fd631 100644 --- a/pkgs/servers/klipper/klipper-flash.nix +++ b/pkgs/servers/klipper/klipper-flash.nix @@ -4,7 +4,7 @@ , pkgsCross , klipper , klipper-firmware -, python2 +, python3 , avrdude , stm32flash , mcu ? "mcu" @@ -19,7 +19,7 @@ in writeShellApplication { name = "klipper-flash-${mcu}"; runtimeInputs = [ - python2 + python3 pkgsCross.avr.stdenv.cc gnumake ] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ];