From f498ceb6f2b755bafbf8d078243f4ab209224cc6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 28 Nov 2019 22:16:04 +0000 Subject: [PATCH] pythonPackages.moviepy: switch to opencv3 opencv2 is essentially EOL and has security concerns --- pkgs/development/python-modules/moviepy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 681a5d3b1c54..7e9215f33933 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; {