summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-09 02:10:02 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-09 02:10:02 +0200
commitd89fe68254e49401d8b7ae490c35a4158998f864 (patch)
treeb6835caa40133b2ca93387b073d79426acebf5e1
parentd779fd8706dc7512730ddca4f4927c51e566f634 (diff)
downloadnixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar.gz
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar.bz2
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar.lz
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar.xz
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.tar.zst
nixpkgs-d89fe68254e49401d8b7ae490c35a4158998f864.zip
octoprint.plugins.octolabse: 0.4.1 -> 0.4.2, mark broken
-rw-r--r--pkgs/applications/misc/octoprint/plugins.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index a58e3762079..fae093647a2 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,6 +1,7 @@
 { lib
 , fetchFromGitHub
 , fetchFromGitLab
+, fetchpatch
 , marlin-calc
 }:
 
@@ -426,25 +427,36 @@ in
 
   octolapse = buildPlugin rec {
     pname = "Octolapse";
-    version = "0.4.1";
+    version = "0.4.2";
 
     src = fetchFromGitHub {
       owner = "FormerLurker";
       repo = pname;
       rev = "v${version}";
-      sha256 = "13q20g7brabplc198jh67lk65rn140r8217iak9b2jy3in8fggv4";
+      sha256 = "sha256-QP6PkKWKUv4uIaYdqTAsZmK7DVes94Q9K/DrBYrWxzY=";
     };
 
+    patches = [
+      # fix version constraint
+      # https://github.com/FormerLurker/Octolapse/pull/894
+      (fetchpatch {
+        url = "https://github.com/FormerLurker/Octolapse/commit/0bd7db2430aef370f2665c6c7011fc3bb559122e.patch";
+        hash = "sha256-z2aEq5sJGarGtIDbTRCvXdSj+kq8HIVvLRWpKutmJNY=";
+      })
+    ];
+
     # Test fails due to code executed on import, see #136513
     #pythonImportsCheck = [ "octoprint_octolapse" ];
 
-    propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six psutil file-read-backwards ];
+    propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six pillow psutil file-read-backwards ];
 
     meta = with lib; {
       description = "Stabilized timelapses for Octoprint";
       homepage = "https://github.com/FormerLurker/OctoLapse";
       license = licenses.agpl3Plus;
       maintainers = with maintainers; [ illustris j0hax ];
+      # requires pillow >=6.2.0,<7.0.0
+      broken = true;
     };
   };