From 88c7f3c0a54cb52bc3498d5c10d112ee66d16b8e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 8 Jul 2019 22:55:06 +0200 Subject: [PATCH] murex: include octoprint plugins in nixpkgs --- murex.nix | 57 +------------------------------------------------------ 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/murex.nix b/murex.nix index d92d38a..7aea3a2 100644 --- a/murex.nix +++ b/murex.nix @@ -77,62 +77,7 @@ services.octoprint = { enable = true; - plugins = plugins: with pkgs; with python2Packages; - let rpi-gpio = buildPythonPackage rec { - pname = "RPi.GPIO"; - version = "0.6.5"; - src = fetchPypi { - inherit pname version; - sha256 = "a4210ad63bfe844e43995286de0d3950dfacfa0f3799bb9392770ac54a7d2e47"; - }; - }; in - [ - # bundles binary which is not built for aarch64 :-( - # (buildPythonPackage rec { - # pname = "OctoPrint-PrintTimeGenius"; - # version = "1.3"; - # src = fetchFromGitHub { - # owner = "eyal0"; - # repo = pname; - # rev = version; - # sha256 = "1jfiih8vpd1x5yk2yq9sgi0rbjh2ipasj39vs2dmfm3va2fhy75l"; - # }; - # propagatedBuildInputs = [ octoprint ]; - # }) - (buildPythonPackage rec { - pname = "OctoPrint-TouchUI"; - version = "0.3.13"; - src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = pname; - rev = version; - sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; - }; - propagatedBuildInputs = [ octoprint ]; - }) - (buildPythonPackage rec { - pname = "OctoPrint-Cost"; - version = "master"; - src = fetchFromGitHub { - owner = "jasiek"; - repo = pname; - rev = "d1dc75aa64df332d54a237864a116c63cb9e6cf5"; - sha256 = "0xkz1ygb5jspl1iy841lrv3fwm92ay09m6rw9g4vchwldqbgpjf3"; - }; - propagatedBuildInputs = [ octoprint ]; - }) - (buildPythonPackage rec { - pname = "OctoPrint-PSUControl"; - version = "0.1.8"; - src = fetchFromGitHub { - owner = "kantlivelong"; - repo = pname; - rev = version; - sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; - }; - propagatedBuildInputs = [ octoprint rpi-gpio ]; - }) - ]; + plugins = ps: with ps; [ printtimegenius touchui psucontrol ]; }; systemd.services.setupGpioForRelais = rec { wantedBy = [ "octoprint.service" ];