pythonPackages.moviepy: switch to opencv3
opencv2 is essentially EOL and has security concerns
This commit is contained in:
parent
d04bdce3d1
commit
f498ceb6f2
@ -11,7 +11,7 @@
|
|||||||
, tqdm
|
, tqdm
|
||||||
# Advanced image processing (triples size of output)
|
# Advanced image processing (triples size of output)
|
||||||
, advancedProcessing ? false
|
, advancedProcessing ? false
|
||||||
, opencv ? null
|
, opencv3 ? null
|
||||||
, scikitimage ? null
|
, scikitimage ? null
|
||||||
, scikitlearn ? null
|
, scikitlearn ? null
|
||||||
, scipy ? null
|
, scipy ? null
|
||||||
@ -20,7 +20,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
assert advancedProcessing -> (
|
assert advancedProcessing -> (
|
||||||
opencv != null && scikitimage != null && scikitlearn != null
|
opencv3 != null && scikitimage != null && scikitlearn != null
|
||||||
&& scipy != null && matplotlib != null && youtube-dl != null);
|
&& scipy != null && matplotlib != null && youtube-dl != null);
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
numpy decorator imageio imageio-ffmpeg tqdm requests proglog
|
numpy decorator imageio imageio-ffmpeg tqdm requests proglog
|
||||||
] ++ (stdenv.lib.optionals advancedProcessing [
|
] ++ (stdenv.lib.optionals advancedProcessing [
|
||||||
opencv scikitimage scikitlearn scipy matplotlib youtube-dl
|
opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl
|
||||||
]);
|
]);
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user