diff options
| author | Alex Whitt <alex.joseph.whitt@gmail.com> | 2020-02-13 15:57:50 -0500 |
|---|---|---|
| committer | Alex Whitt <alex.joseph.whitt@gmail.com> | 2020-02-13 15:58:04 -0500 |
| commit | dba13a032ceb3b9f2c95775784ff001f578054b1 (patch) | |
| tree | 45bb1bbb5e73b95522b19f4f193a32221676f84f /pkgs/applications/misc | |
| parent | 8130f3c1c2bb0e533b5e150c39911d6e61dcecc2 (diff) | |
| download | nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar.gz nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar.bz2 nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar.lz nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar.xz nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.tar.zst nixlib-dba13a032ceb3b9f2c95775784ff001f578054b1.zip | |
Octoprint-PrintTimeGenius: 2.0.2 -> 2.2.1
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/octoprint/plugins.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/octoprint/printtimegenius-logging.patch | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ce800e8f18be..cd1dfbe1396a 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -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"; diff --git a/pkgs/applications/misc/octoprint/printtimegenius-logging.patch b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch new file mode 100644 index 000000000000..66c2e83d62ca --- /dev/null +++ b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch @@ -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 |