diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch | 175 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix | 275 |
2 files changed, 150 insertions, 300 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch deleted file mode 100644 index 24c9c4a80f5d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov <ab@fmap.me> -Date: Wed, 23 Nov 2016 00:40:48 +0300 -Subject: [PATCH] Build and use one version of preprocessor library - ---- - octoprint_m33fio/__init__.py | 73 ++---------------------------------------- - shared library source/Makefile | 62 +++-------------------------------- - 2 files changed, 6 insertions(+), 129 deletions(-) - -diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 054870a..4d5ecc1 100755 ---- a/octoprint_m33fio/__init__.py -+++ b/octoprint_m33fio/__init__.py -@@ -1189,78 +1189,9 @@ class M33FioPlugin( - # Check if using shared library or checking if it is usable - if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : - -- # Check if running on Linux -- if platform.uname()[0].startswith("Linux") : -- -- # Check if running on a Raspberry Pi 1 -- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") -- -- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 -- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") -- -- # Otherwise check if running on an ARM7 device -- elif platform.uname()[4].startswith("armv7") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") -- -- # Otherwise check if using an i386 or x86-64 device -- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") -- -- # Otherwise check if running on Windows and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") -- -- # Otherwise check if running on macOS and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -- -- # Otherwise check if running FreeBSD -- elif platform.uname()[0].startswith("FreeBSD") : -- -- # TODO: Compile FreeBSD shared library pre-processors -- pass -- - # Check if shared library was set - if self.sharedLibrary : - -diff --git a/shared library source/Makefile b/shared library source/Makefile -index 792b4f4..4c74f5c 100755 ---- a/shared library source/Makefile -+++ b/shared library source/Makefile -@@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 --LIBRARY_NAME = preprocessor --TARGET_PLATFORM = LINUX64 -+LIBRARY_NAME = libpreprocessor - VER = .1 - --ifeq ($(TARGET_PLATFORM), LINUX32) -- PROG = $(LIBRARY_NAME)_i386.so -- CC = g++ -- CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), LINUX64) -- PROG = $(LIBRARY_NAME)_x86-64.so -- CC = g++ -- CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS32) -- PROG = $(LIBRARY_NAME)_i386.dll -- CC = i686-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS64) -- PROG = $(LIBRARY_NAME)_x86-64.dll -- CC = x86_64-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI) -- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI2) -- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), ARM7) -- PROG = $(LIBRARY_NAME)_arm7.so -- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), MACOS32) -- PROG = $(LIBRARY_NAME)_i386.dylib -- CC = clang++ -- CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -- --endif -- --ifeq ($(TARGET_PLATFORM), MACOS64) -- PROG = $(LIBRARY_NAME)_x86-64.dylib -- CC = clang++ -- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) --endif -+PROG = $(LIBRARY_NAME).so -+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) - - SRCS = preprocessor.cpp gcode.cpp vector.cpp - CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared - - all: -- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) -+ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) - - clean: - rm -f ../octoprint_m33fio/static/libraries/$(PROG) --- -2.14.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 514ac859c776..421690f29d46 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -13,170 +13,151 @@ self: super: let in { inherit buildPlugin; - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 - - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "0.6"; - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = version; + sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; }; - patches = [ - ./m33-fio-one-library.patch - ]; - - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; - meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = "https://github.com/donovan6000/M33-Fio"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; + bedlevelvisualizer = buildPlugin rec { + pname = "BedLevelVisualizer"; + version = "0.1.15"; src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; + owner = "jneilliii"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; }; - propagatedBuildInputs = with super; [ paho-mqtt ]; + propagatedBuildInputs = with super; [ numpy ]; meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; + description = "Displays 3D mesh of bed topography report"; + homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ lovesegfault ]; }; }; - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.1.1"; src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; }; meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ gebner ]; }; }; - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.24.0"; src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; + owner = "OllisGit"; + repo = pname; rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; }; meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; + homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ j0hax ]; }; }; - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.9"; src = fetchFromGitHub { - owner = "OctoPrint"; + owner = "ieatacid"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.14"; + marlingcodedocumentation = buildPlugin rec { + pname = "MarlinGcodeDocumentation"; + version = "0.11.0"; src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + owner = "costas-basdekis"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; }; meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; + homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ lovesegfault ]; }; }; - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.9"; + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "kantlivelong"; - repo = "OctoPrint-${pname}"; + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; rev = version; - sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; }; - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; + propagatedBuildInputs = with super; [ paho-mqtt ]; meta = with stdenv.lib; { - description = "OctoPrint plugin to control ATX/AUX power supply"; - homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + description = "Publish printer status MQTT"; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ peterhoeg ]; }; }; printtimegenius = buildPlugin rec { pname = "PrintTimeGenius"; - version = "2.2.1"; + version = "2.2.6"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + sha256 = "04zfgd3x3lbriyzwhpqnwdcfdm19fsqgsb7l2ix5d0ssmqxwg2r6"; }; preConfigure = '' @@ -197,78 +178,122 @@ in { }; }; - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.9"; - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; }; + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ gebner ]; }; }; - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "1.0.3"; src = fetchFromGitHub { - owner = "ieatacid"; + owner = "Sebclem"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; }; meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3; maintainers = with maintainers; [ WhittlesJr ]; }; }; - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; }; meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + description = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ abbradar ]; }; }; - displaylayerprogress = buildPlugin rec { - pname = "OctoPrint-DisplayLayerProgress"; - version = "1.24.0"; + themeify = buildPlugin rec { + pname = "Themeify"; + version = "1.2.2"; src = fetchFromGitHub { - owner = "OllisGit"; - repo = pname; + owner = "Birkbjo"; + repo = "Octoprint-${pname}"; + rev = "v${version}"; + sha256 = "0j1qs6kyh947npdy7pqda25fjkqinpas3sy0qyscqlxi558lhvx2"; + }; + + meta = with stdenv.lib; { + description = "Beautiful themes for OctoPrint"; + homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; rev = version; - sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; + sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; }; meta = with stdenv.lib; { - description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; - homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; license = licenses.agpl3; - maintainers = with maintainers; [ j0hax ]; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; }; }; @@ -293,13 +318,13 @@ in { octoprint-dashboard = buildPlugin rec { pname = "OctoPrint-Dashboard"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "StefanCohen"; repo = pname; rev = version; - sha256 = "1psk069g8xdpgbzmna51dh978vrildh33dn7kbbi5y31ry5c3gx6"; + sha256 = "0p94jwd7kagh3sixhcrqmsgbay4aaf9l1pgyi2b45jym8pvld5n4"; }; meta = with stdenv.lib; { |