summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2019-11-28 22:16:04 +0000
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-02-05 22:31:01 +0100
commitf498ceb6f2b755bafbf8d078243f4ab209224cc6 (patch)
tree8e4ac28f68b907660aa63da136fcd9c2aa18ed73
parentd04bdce3d1690f41667125995efcf310d936b3bf (diff)
downloadnixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar.gz
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar.bz2
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar.lz
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar.xz
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.tar.zst
nixpkgs-f498ceb6f2b755bafbf8d078243f4ab209224cc6.zip
pythonPackages.moviepy: switch to opencv3
opencv2 is essentially EOL and has security concerns
-rw-r--r--pkgs/development/python-modules/moviepy/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 681a5d3b1c5..7e9215f3393 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -11,7 +11,7 @@
 , tqdm
 # Advanced image processing (triples size of output)
 , advancedProcessing ? false
-, opencv ? null
+, opencv3 ? null
 , scikitimage ? null
 , scikitlearn ? null
 , scipy ? null
@@ -20,7 +20,7 @@
 }:
 
 assert advancedProcessing -> (
-  opencv != null && scikitimage != null && scikitlearn != null
+  opencv3 != null && scikitimage != null && scikitlearn != null
   && scipy != null && matplotlib != null && youtube-dl != null);
 
 buildPythonPackage rec {
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     numpy decorator imageio imageio-ffmpeg tqdm requests proglog
   ] ++ (stdenv.lib.optionals advancedProcessing [
-    opencv scikitimage scikitlearn scipy matplotlib youtube-dl
+    opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl
   ]);
 
   meta = with stdenv.lib; {