public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octoprint: 1.3.11 -> 1.3.12 (#72630)

Browse Source 
octoprint: 1.3.11 -> 1.3.12
This commit is contained in:
Gabriel Ebner 2019-11-02 23:28:53 +01:00 committed by GitHub
commit b938107a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/octoprint/default.nix
View File

@ -56,17 +56,18 @@ let
"websocket-client" "websocket-client"
"wrapt" "wrapt"
"sentry-sdk" "sentry-sdk"
"werkzeug" # 0.16 just deprecates some stuff
]; ];
in py.pkgs.buildPythonApplication rec { in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint"; pname = "OctoPrint";
version = "1.3.11"; version = "1.3.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foosel"; owner = "foosel";
repo = "OctoPrint"; repo = "OctoPrint";
rev = version; rev = version;
sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx"; sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd";
}; };
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = with py.pkgs; [
@ -75,7 +76,7 @@ in py.pkgs.buildPythonApplication rec {
psutil pyserial flask_login netaddr markdown sockjs-tornado psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client pylru pyyaml sarge feedparser netifaces click websocket_client
scandir chainmap future futures wrapt monotonic emoji scandir chainmap future futures wrapt monotonic emoji
frozendict cachelib sentry-sdk typing frozendict cachelib sentry-sdk typing filetype
] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
checkInputs = with py.pkgs; [ nose mock ddt ]; checkInputs = with py.pkgs; [ nose mock ddt ];
@ -96,6 +97,6 @@ in py.pkgs.buildPythonApplication rec {
homepage = https://octoprint.org/; homepage = https://octoprint.org/;
description = "The snappy web interface for your 3D printer"; description = "The snappy web interface for your 3D printer";
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar gebner ];
}; };
} }

14
pkgs/applications/misc/octoprint/plugins.nix
View File

@ -47,13 +47,13 @@ let
mqtt = buildPlugin rec { mqtt = buildPlugin rec {
pname = "MQTT"; pname = "MQTT";
version = "0.8.0"; version = "0.8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OctoPrint"; owner = "OctoPrint";
repo = "OctoPrint-MQTT"; repo = "OctoPrint-MQTT";
rev = version; rev = version;
sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7"; sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd";
}; };
propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
@ -87,13 +87,13 @@ let
stlviewer = buildPlugin rec { stlviewer = buildPlugin rec {
pname = "STLViewer"; pname = "STLViewer";
version = "0.4.1"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jneilliii"; owner = "jneilliii";
repo = "OctoPrint-STLViewer"; repo = "OctoPrint-STLViewer";
rev = "v${version}"; rev = version;
sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0"; sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -168,13 +168,13 @@ let
printtimegenius = buildPlugin rec { printtimegenius = buildPlugin rec {
pname = "PrintTimeGenius"; pname = "PrintTimeGenius";
version = "1.3.1"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eyal0"; owner = "eyal0";
repo = "OctoPrint-${pname}"; repo = "OctoPrint-${pname}";
rev = version; rev = version;
sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28"; sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f";
}; };
preConfigure = '' preConfigure = ''

6
pkgs/tools/misc/marlin-calc/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "marlin-calc"; pname = "marlin-calc";
version = "2019-06-04"; version = "2019-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eyal0"; owner = "eyal0";
repo = "Marlin"; repo = "Marlin";
rev = "4120d1c72d6c32e9c5cc745c05d20963ba4bbca3"; rev = "3d5a5c86bea35a2a169eb56c70128bf2d070feef";
sha256 = "06aly7s4k1r31njm43sbxq9a0127sw43pnaddh92a3cc39rbj2va"; sha256 = "14sqajm361gnrcqv84g7kbmyqm8pppbhqsabszc4j2cn7vbwkdg5";
}; };
buildPhase = '' buildPhase = ''