Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

octoprint: 1.3.11 -> 1.3.12 #72630

Merged
merged 5 commits into from Nov 2, 2019
Merged

octoprint: 1.3.11 -> 1.3.12 #72630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1d87b7
octoprint: 1.3.11 -> 1.3.12
gebner Nov 2, 2019
04742d0
octoprint-plugins.mqtt: 0.8.0 -> 0.8.6
gebner Nov 2, 2019
6abfaf8
octoprint-plugins.stlviewer: 0.4.1 -> 0.4.2
gebner Nov 2, 2019
311656e
marlin-calc: 2019-06-04 -> 2019-10-17
gebner Nov 2, 2019
5ed4bee
octoprint-plugins.printtimegenius: 1.3.1 -> 2.0.2
gebner Nov 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkgs/applications/misc/octoprint/default.nix
View file
Open in desktop
Expand Up @@ -56,17 +56,18 @@ let
"websocket-client"
"wrapt"
"sentry-sdk"
"werkzeug" # 0.16 just deprecates some stuff
];

in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint";
version = "1.3.11";
version = "1.3.12";

src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx";
sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd";
};

propagatedBuildInputs = with py.pkgs; [
Expand All @@ -75,7 +76,7 @@ in py.pkgs.buildPythonApplication rec {
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
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 ];

checkInputs = with py.pkgs; [ nose mock ddt ];
Expand All @@ -96,6 +97,6 @@ in py.pkgs.buildPythonApplication rec {
homepage = https://octoprint.org/;
description = "The snappy web interface for your 3D printer";
license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ];
maintainers = with maintainers; [ abbradar gebner ];
};
}
14 changes: 7 additions & 7 deletions pkgs/applications/misc/octoprint/plugins.nix
View file
Open in desktop
Expand Up @@ -47,13 +47,13 @@ let

mqtt = buildPlugin rec {
pname = "MQTT";
version = "0.8.0";
version = "0.8.6";

src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-MQTT";
rev = version;
sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7";
sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd";
};

propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
Expand Down Expand Up @@ -87,13 +87,13 @@ let

stlviewer = buildPlugin rec {
pname = "STLViewer";
version = "0.4.1";
version = "0.4.2";

src = fetchFromGitHub {
owner = "jneilliii";
repo = "OctoPrint-STLViewer";
rev = "v${version}";
sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
rev = version;
sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b";
};

meta = with stdenv.lib; {
Expand Down Expand Up @@ -168,13 +168,13 @@ let

printtimegenius = buildPlugin rec {
pname = "PrintTimeGenius";
version = "1.3.1";
version = "2.0.2";

src = fetchFromGitHub {
owner = "eyal0";
repo = "OctoPrint-${pname}";
rev = version;
sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28";
sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f";
};

preConfigure = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/tools/misc/marlin-calc/default.nix
View file
Open in desktop
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation {
pname = "marlin-calc";
version = "2019-06-04";
version = "2019-10-17";

src = fetchFromGitHub {
owner = "eyal0";
repo = "Marlin";
rev = "4120d1c72d6c32e9c5cc745c05d20963ba4bbca3";
sha256 = "06aly7s4k1r31njm43sbxq9a0127sw43pnaddh92a3cc39rbj2va";
rev = "3d5a5c86bea35a2a169eb56c70128bf2d070feef";
sha256 = "14sqajm361gnrcqv84g7kbmyqm8pppbhqsabszc4j2cn7vbwkdg5";
};

buildPhase = ''
Expand Down