diff --git a/nixos/octoprint.nix b/nixos/octoprint.nix index 04636e28..a9753888 100644 --- a/nixos/octoprint.nix +++ b/nixos/octoprint.nix @@ -15,6 +15,7 @@ in { # host = mkIf config.networking.enableIPv6 "::"; plugins = python3Packages: with python3Packages; [ prometheus-exporter + octorant abl-expert bedlevelvisualizer #displayprogress / displaylayerprogress? diff --git a/overlays/print.nix b/overlays/print.nix index 432cff11..46f3f59f 100644 --- a/overlays/print.nix +++ b/overlays/print.nix @@ -11,7 +11,7 @@ in { inherit (python3Packages) buildPlugin; }; packageOverrides = python3Packages: python3Packages'prev: lib.mapAttrs (mapPlugin python3Packages) { - inherit (final.octoprintPlugins) prometheus-exporter; + inherit (final.octoprintPlugins) prometheus-exporter octorant; }; octoprint = prev.octoprint.override (old: { packageOverrides = lib.composeExtensions old.packageOverrides or (_: _: {}) packageOverrides; @@ -30,6 +30,7 @@ in { callPackage = prev.octoprintPlugins.callPackage or callPackage; prometheus-exporter = callPackage ../packages/octoprint/prometheus-exporter.nix { }; + octorant = callPackage ../packages/octoprint/octorant.nix { }; }; curaengine = prev.curaengine.override { diff --git a/packages/octoprint/octorant.nix b/packages/octoprint/octorant.nix new file mode 100644 index 00000000..6397b3aa --- /dev/null +++ b/packages/octoprint/octorant.nix @@ -0,0 +1,24 @@ +{ buildPlugin +, python3Packages +, fetchFromGitHub +}: let + version = "1.3.4"; +in buildPlugin { + pname = "OctoPrint-Octorant"; + inherit version; + + src = fetchFromGitHub { + owner = "bchanudet"; + repo = "OctoPrint-Octorant"; + rev = version; + sha256 = "sha256-gP79zlJ8gdtpddXOJIMhouSbwXnrSf+c1bURkN/7jvw="; + }; + + propagatedBuildInputs = with python3Packages; [ + pillow + ]; + + meta = { + homepage = "https://github.com/bchanudet/OctoPrint-Octorant"; + }; +}