Octoprint-PrintTimeGenius: 2.0.2 -> 2.2.1

This commit is contained in:
Alex Whitt 2020-02-13 15:57:50 -05:00
parent 8130f3c1c2
commit dba13a032c
2 changed files with 23 additions and 2 deletions

View file

@ -168,13 +168,13 @@ let
printtimegenius = buildPlugin rec {
pname = "PrintTimeGenius";
version = "2.0.2";
version = "2.2.1";
src = fetchFromGitHub {
owner = "eyal0";
repo = "OctoPrint-${pname}";
rev = version;
sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f";
sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h";
};
preConfigure = ''
@ -183,6 +183,10 @@ let
sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
'';
patches = [
./printtimegenius-logging.patch
];
meta = with stdenv.lib; {
description = "Better print time estimation for OctoPrint";
homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";

View file

@ -0,0 +1,17 @@
diff --git a/setup.py b/setup.py
index 6a6610e..cc45902 100644
--- a/setup.py
+++ b/setup.py
@@ -35,9 +35,9 @@ plugin_license = "AGPLv3"
# Any additional requirements besides OctoPrint should be listed here
# For now, require the working release, which is only 1.3.9rc1.
plugin_requires = ["OctoPrint>=1.3.9rc1", "psutil", "sarge"]
-from sys import version_info
-if version_info[0] < 3:
- plugin_requires.append("logging")
+#from sys import version_info
+#if version_info[0] < 3:
+# plugin_requires.append("logging")
### --------------------------------------------------------------------------------------------------------------------
### More advanced options that you usually shouldn't have to touch follow after this point