From e6f4f3a388bfee6b1554e056834ba477f7704c59 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 5 Sep 2020 11:39:31 +0200 Subject: [PATCH 1/3] maintainers: add j0hax --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2507b7f20ba..c185837e30a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3623,6 +3623,12 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + j0hax = { + name = "Johannes Arnold"; + email = "johannes.arnold@stud.uni-hannover.de"; + github = "j0hax"; + githubId = 3802620; + }; jacg = { name = "Jacek Generowicz"; email = "jacg@my-post-office.net"; From 452e5b934846dc1b5607341df9ee0a2a249570bd Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 5 Sep 2020 11:48:33 +0200 Subject: [PATCH 2/3] octoprint.python.pkgs.displaylayerprogress: init at 1.23.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 b5d52f5e5f8..a4b32d280c8 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -252,4 +252,23 @@ in { maintainers = with maintainers; [ WhittlesJr ]; }; }; + + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.23.2"; + + src = fetchFromGitHub { + owner = "OllisGit"; + repo = pname; + rev = version; + sha256 = "0yv8gy5dq0rl7zxkvqa98az391aiixl8wbzkyvbmpjar9r6whdzm"; + }; + + 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"; + license = licenses.agpl3; + maintainers = with maintainers; [ j0hax ]; + }; + }; } From 4746456a64f8c0bf126dfc65e71d0796844bb84a Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 5 Sep 2020 11:48:56 +0200 Subject: [PATCH 3/3] octoprint.python.pkgs.octoprint-dashboard: init at 1.13.0 --- 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 a4b32d280c8..ddf68b6f7c3 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -271,4 +271,23 @@ in { maintainers = with maintainers; [ j0hax ]; }; }; + + octoprint-dashboard = buildPlugin rec { + pname = "OctoPrint-Dashboard"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "StefanCohen"; + repo = pname; + rev = version; + sha256 = "1879l05gkkryvhxkmhr3xvd10d4m7i0cr3jk1gdcv47xwyr6q9pf"; + }; + + meta = with stdenv.lib; { + description = "A dashboard for Octoprint"; + homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; + license = licenses.agpl3; + maintainers = with maintainers; [ j0hax ]; + }; + }; }