From 0f9ba3d51e9a4941869401672e0e12cf5170bd84 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 16 Aug 2024 11:36:22 -0700 Subject: [PATCH] fix(logistics): remove cura for now --- ci/packages.nix | 2 +- overlays/print.nix | 11 ----------- systems/logistics/nixos.nix | 5 ++++- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ci/packages.nix b/ci/packages.nix index 262af5f5..fca1cbbd 100644 --- a/ci/packages.nix +++ b/ci/packages.nix @@ -38,7 +38,7 @@ in { # TODO: packages.aarch64-linux.openwebrxplus ]; print.inputs = [ - legacyPackages.x86_64-linux.pkgs.cura-octoprint + #legacyPackages.x86_64-linux.pkgs.cura-octoprint ]; systemd2mqtt.inputs = [ packages.x86_64-linux.systemd2mqtt diff --git a/overlays/print.nix b/overlays/print.nix index b632c219..242eecce 100644 --- a/overlays/print.nix +++ b/overlays/print.nix @@ -73,15 +73,4 @@ in { in callPackage octoklipper {}; }; - - # XXX: build broken upstream ugh... - curaengine = prev.curaengine.override { - inherit (final.python311Packages) libarcus; - }; - cura = prev.cura.override { - python3 = final.python311; - }; - curaPlugins = prev.curaPlugins.override { - python3Packages = final.python311Packages; - }; } diff --git a/systems/logistics/nixos.nix b/systems/logistics/nixos.nix index 29bcd38a..55dc18a7 100644 --- a/systems/logistics/nixos.nix +++ b/systems/logistics/nixos.nix @@ -53,7 +53,10 @@ in { #jack.enable = true; }; - environment.systemPackages = [pkgs.cura-octoprint]; + environment.systemPackages = [ + # XXX: currently broken in nixpkgs + # pkgs.cura-octoprint + ]; users.users.logistics = { uid = 1000;