about summary refs log tree commit diff
path: root/pkgs/development/python-modules/moviepy
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-08-31 22:02:13 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2021-09-01 21:23:27 +0200
commit585a0c18cd033cf2e71a6e8ae18392760018552a (patch)
tree05a9820006fb7f1a62fa0d11e632c0655d8f0d49 /pkgs/development/python-modules/moviepy
parentd471c5ccc0be533d83dd13a26faf452fbfe83ff8 (diff)
python39Packages.moviepy: relax decorator dependency, forma, remove ? null from inputs
Diffstat (limited to 'pkgs/development/python-modules/moviepy')
-rw-r--r--pkgs/development/python-modules/moviepy/default.nix48
1 files changed, 30 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index c3acdbe71ec24..a353816d252e7 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pythonAtLeast
+, pythonOlder
 , numpy
 , decorator
 , imageio
@@ -9,44 +9,56 @@
 , proglog
 , requests
 , tqdm
-# Advanced image processing (triples size of output)
+  # Advanced image processing (triples size of output)
 , advancedProcessing ? false
-, opencv3 ? null
-, scikitimage ? null
-, scikit-learn ? null
-, scipy ? null
-, matplotlib ? null
-, youtube-dl ? null
+, opencv3
+, scikitimage
+, scikit-learn
+, scipy
+, matplotlib
+, youtube-dl
 }:
 
-assert advancedProcessing -> (
-  opencv3 != null && scikitimage != null && scikit-learn != null
-  && scipy != null && matplotlib != null && youtube-dl != null);
-
 buildPythonPackage rec {
   pname = "moviepy";
   version = "1.0.3";
 
-  disabled = !(pythonAtLeast "3.4");
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0"
+  '';
+
   # No tests, require network connection
   doCheck = false;
 
   propagatedBuildInputs = [
-    numpy decorator imageio imageio-ffmpeg tqdm requests proglog
-  ] ++ (lib.optionals advancedProcessing [
-    opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl
-  ]);
+    numpy
+    decorator
+    imageio
+    imageio-ffmpeg
+    tqdm
+    requests
+    proglog
+  ] ++ lib.optionals advancedProcessing [
+    opencv3
+    scikitimage
+    scikit-learn
+    scipy
+    matplotlib
+    youtube-dl
+  ];
 
   meta = with lib; {
     description = "Video editing with Python";
     homepage = "https://zulko.github.io/moviepy/";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
-
 }