diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/applications/misc/octoprint | |
parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/octoprint')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/octoprint/plugins.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 2e3bc058280a..327a59618c2b 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -2,6 +2,8 @@ let buildPlugin = args: python2Packages.buildPythonPackage (args // { + pname = "OctoPrintPlugin-${args.pname}"; + inherit (args) version; propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; # none of the following have tests doCheck = false; @@ -13,7 +15,7 @@ let m3d-fio = self.m33-fio; # added 2016-08-13 m33-fio = buildPlugin rec { - name = "M33-Fio-${version}"; + pname = "M33-Fio"; version = "1.21"; src = fetchFromGitHub { @@ -36,16 +38,15 @@ let ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M33-Fio; description = "OctoPrint plugin for the Micro 3D printer"; - platforms = platforms.all; + homepage = https://github.com/donovan6000/M33-Fio; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; }; mqtt = buildPlugin rec { - name = "OctoPrint-MQTT-${version}"; + pname = "MQTT"; version = "0.8.0"; src = fetchFromGitHub { @@ -58,16 +59,15 @@ let propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; meta = with stdenv.lib; { - homepage = https://github.com/OctoPrint/OctoPrint-MQTT; description = "Publish printer status MQTT"; - platforms = platforms.all; + homepage = https://github.com/OctoPrint/OctoPrint-MQTT; license = licenses.agpl3; maintainers = with maintainers; [ peterhoeg ]; }; }; titlestatus = buildPlugin rec { - name = "OctoPrint-TitleStatus-${version}"; + pname = "TitleStatus"; version = "0.0.4"; src = fetchFromGitHub { @@ -78,16 +78,15 @@ let }; meta = with stdenv.lib; { - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; description = "Show printers status in window title"; - platforms = platforms.all; + homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; }; stlviewer = buildPlugin rec { - name = "OctoPrint-STLViewer-${version}"; + pname = "STLViewer"; version = "0.4.1"; src = fetchFromGitHub { @@ -98,9 +97,8 @@ let }; meta = with stdenv.lib; { - homepage = https://github.com/jneilliii/Octoprint-STLViewer; description = "A simple stl viewer tab for OctoPrint"; - platforms = platforms.all; + homepage = https://github.com/jneilliii/Octoprint-STLViewer; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; |