From 76bbe9eb3425977ec8044d8698581c3910a783d9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:34:25 -0700 Subject: [PATCH 01/13] octoprint.python.pkgs.m33-fio: remove It is incompatible with modern octoprints and has been abandoned by upstream. c.f. https://plugins.octoprint.org/plugins/m33fio/ --- pkgs/applications/misc/octoprint/plugins.nix | 34 -------------------- 1 file changed, 34 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 514ac859c77..f9b13a6be45 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -13,40 +13,6 @@ 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"; - - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; - }; - - 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 ]; - }; - }; - mqtt = buildPlugin rec { pname = "MQTT"; version = "0.8.6"; From a9c2caea4ff07c305588368116d96a13f1da351b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:36:43 -0700 Subject: [PATCH 02/13] octoprint.python.pkgs.mqtt: 0.8.6 -> 0.8.7 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index f9b13a6be45..b939469534e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -15,13 +15,13 @@ in { mqtt = buildPlugin rec { pname = "MQTT"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-MQTT"; rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; }; propagatedBuildInputs = with super; [ paho-mqtt ]; From e4cf0fdd42903a84381a5291eb96c88c43d3649e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:38:21 -0700 Subject: [PATCH 03/13] octoprint.python.pkgs.titlestatus: 0.0.4 -> 0.0.5 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index b939469534e..a571c6113d0 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -36,13 +36,13 @@ in { titlestatus = buildPlugin rec { pname = "TitleStatus"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "MoonshineSG"; repo = "OctoPrint-TitleStatus"; rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; }; meta = with stdenv.lib; { From a2bdd1e70d8b9976487c7858ba7c1eaf55959dda Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:41:04 -0700 Subject: [PATCH 04/13] octoprint.python.pkgs.curaenginelegacy: 1.0.2 -> 1.1.1 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index a571c6113d0..27b56998c68 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -74,13 +74,13 @@ in { curaenginelegacy = buildPlugin rec { pname = "CuraEngineLegacy"; - version = "1.0.2"; + version = "1.1.1"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; }; meta = with stdenv.lib; { From 96a7a76e6972428069956c3f2ce3108602850a94 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:44:53 -0700 Subject: [PATCH 05/13] octoprint.python.pkgs.touchui: 0.3.14 -> 0.3.16 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 27b56998c68..adf54f11278 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -93,13 +93,13 @@ in { touchui = buildPlugin rec { pname = "TouchUI"; - version = "0.3.14"; + version = "0.3.16"; src = fetchFromGitHub { owner = "BillyBlaze"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; }; meta = with stdenv.lib; { From 48f69d45dd2d4923a26236981fff650b54341d75 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:47:16 -0700 Subject: [PATCH 06/13] octoprint.python.pkgs.printtimegenius: 2.2.1 -> 2.2.6 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index adf54f11278..086605f70e4 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -136,13 +136,13 @@ in { 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 = '' From b9df9c74546f915b0ca6f1991a543838211d6470 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:49:29 -0700 Subject: [PATCH 07/13] octoprint.python.pkgs.abl-expert: 2019-12-21 -> 0.6 --- pkgs/applications/misc/octoprint/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 086605f70e4..aaf3c616cae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -165,12 +165,12 @@ in { abl-expert = buildPlugin rec { pname = "ABL_Expert"; - version = "2019-12-21"; + version = "0.6"; src = fetchgit { url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + rev = version; + sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; }; meta = with stdenv.lib; { From f51bd15d67b8c507f5e1b14db28870f3cb759764 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:50:49 -0700 Subject: [PATCH 08/13] octoprint.python.pkgs.gcodeeditor: 0.2.6 -> 0.2.9 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index aaf3c616cae..2b3b83c7fc3 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -183,13 +183,13 @@ in { gcodeeditor = buildPlugin rec { pname = "GcodeEditor"; - version = "0.2.6"; + version = "0.2.9"; src = fetchFromGitHub { owner = "ieatacid"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; meta = with stdenv.lib; { From f706072579b70d4c4921a90a72735b52e60bed72 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:52:09 -0700 Subject: [PATCH 09/13] octoprint.python.pkgs.simpleemergencystop: 0.2.5 -> 1.0.3 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 2b3b83c7fc3..7e371f78053 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -202,13 +202,13 @@ in { simpleemergencystop = buildPlugin rec { pname = "SimpleEmergencyStop"; - version = "0.2.5"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Sebclem"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; }; meta = with stdenv.lib; { From f2e31a99217367820ea93a96d6613c63ef7ee8d5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:53:28 -0700 Subject: [PATCH 10/13] octoprint.python.pkgs.octoprint-dashboard: 1.15.1 -> 1.15.2 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 7e371f78053..85434210526 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -259,13 +259,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; { From ea33f3dab8bbdf1c287b65804196bff85dd49afa Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 20 Oct 2020 23:56:39 -0700 Subject: [PATCH 11/13] octoprint: sort plugins --- pkgs/applications/misc/octoprint/plugins.nix | 212 +++++++++---------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 85434210526..ef5f181c3ae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -13,62 +13,21 @@ self: super: let in { inherit buildPlugin; - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.7"; + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "0.6"; - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; rev = version; - sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; - }; - - propagatedBuildInputs = with super; [ paho-mqtt ]; - - meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; - license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.5"; - - src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; - rev = version; - sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; + sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; }; meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + 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; [ abbradar ]; - }; - }; - - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; - }; - - meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -91,46 +50,62 @@ in { }; }; - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.16"; + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.24.0"; src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; + owner = "OllisGit"; + repo = pname; rev = version; - sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; + sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; }; 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 = "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; [ gebner ]; + maintainers = with maintainers; [ j0hax ]; }; }; - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.9"; + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.9"; src = fetchFromGitHub { - owner = "kantlivelong"; + owner = "ieatacid"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; + meta = with stdenv.lib; { + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; + rev = version; + sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; + }; + + 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 ]; }; }; @@ -163,40 +138,27 @@ in { }; }; - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "0.6"; - - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = version; - sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; - }; - - meta = with stdenv.lib; { - 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 ]; - }; - }; - - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.9"; + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.9"; src = fetchFromGitHub { - owner = "ieatacid"; + owner = "kantlivelong"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; }; + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + 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 ]; }; }; @@ -219,22 +181,60 @@ in { }; }; - displaylayerprogress = buildPlugin rec { - pname = "OctoPrint-DisplayLayerProgress"; - version = "1.24.0"; + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; src = fetchFromGitHub { - owner = "OllisGit"; - repo = pname; + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; rev = version; - sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; }; 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 = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; - maintainers = with maintainers; [ j0hax ]; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; + }; + + meta = with stdenv.lib; { + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + license = licenses.agpl3; + 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 ]; }; }; From f66c7667e3e2289638ae6983e6f4c2460ad9f180 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 21 Oct 2020 00:00:46 -0700 Subject: [PATCH 12/13] octoprint.python.pkgs.themeify: init at 1.2.2 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ef5f181c3ae..c258d8bbf3a 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -200,6 +200,25 @@ in { }; }; + themeify = buildPlugin rec { + pname = "Themeify"; + version = "1.2.2"; + + src = fetchFromGitHub { + 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"; From d6a1aff820261eba7e84a2468f4cd415fc2631e5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 21 Oct 2020 00:06:03 -0700 Subject: [PATCH 13/13] octoprint.python.pkgs.bedlevelvisualizer: init at 0.1.15 --- pkgs/applications/misc/octoprint/plugins.nix | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index c258d8bbf3a..366b3866dfd 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -31,6 +31,27 @@ in { }; }; + bedlevelvisualizer = buildPlugin rec { + pname = "BedLevelVisualizer"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; + }; + + propagatedBuildInputs = with super; [ numpy ]; + + meta = with stdenv.lib; { + description = "Displays 3D mesh of bed topography report"; + homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; + }; + }; + curaenginelegacy = buildPlugin rec { pname = "CuraEngineLegacy"; version = "1.1.1";