octoprint.python.pkgs.printtimegenius: 2.2.6 -> 2.2.8

pkgs/applications/misc/octoprint/plugins.nix

@@ -208,25 +208,26 @@ in {
 
   printtimegenius = buildPlugin rec {
     pname = "PrintTimeGenius";
-    version = "2.2.6";
+    version = "2.2.8";
 
     src = fetchFromGitHub {
       owner = "eyal0";
       repo = "OctoPrint-${pname}";
       rev = version;
-      sha256 = "04zfgd3x3lbriyzwhpqnwdcfdm19fsqgsb7l2ix5d0ssmqxwg2r6";
+      sha256 = "sha256-Bbpm7y4flzEbUb6Sgkp6hIIHs455A0IsbmzvZwlkbh0=";
     };
 
+    propagatedBuildInputs = with super; [
+      psutil
+      sarge
+    ];
+
     preConfigure = ''
       # PrintTimeGenius ships with marlin-calc binaries for multiple architectures
       rm */analyzers/marlin-calc*
       sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
     '';
 
-    patches = [
-      ./printtimegenius-logging.patch
-    ];
-
     meta = with lib; {
       description = "Better print time estimation for OctoPrint";
       homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";

pkgs/applications/misc/octoprint/printtimegenius-logging.patch

@@ -1,17 +0,0 @@
-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