diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2019-04-20 10:57:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 10:57:09 +0200 |
| commit | 276d82476bfdb0ba085909986f5c959c3ef4b904 (patch) | |
| tree | 723904842461781c3e437c27122a4b3f7e227d99 /pkgs/development/python-modules | |
| parent | 575d6a48267670cbb298770a910fb1c6311f55fd (diff) | |
| parent | 64476e879b949764052b1ae1096aee1e259ca78b (diff) | |
| download | nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar.gz nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar.bz2 nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar.lz nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar.xz nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.tar.zst nixlib-276d82476bfdb0ba085909986f5c959c3ef4b904.zip | |
Merge pull request #59862 from JohnAZoidberg/moviepy-1.0.0-deps
Fix pythonPackages.moviepy
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/moviepy/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/python-modules/proglog/default.nix | 19 |
2 files changed, 44 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 693d5cf5d7f0..7171409bec84 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,25 +1,48 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonAtLeast , numpy , decorator , imageio +, imageio-ffmpeg , isPy3k +, proglog +, requests , tqdm +# Advanced image processing (triples size of output) +, advancedProcessing ? false +, opencv ? null +, scikitimage ? null +, scikitlearn ? null +, scipy ? null +, matplotlib ? null +, youtube-dl ? null }: +assert advancedProcessing -> ( + opencv != null && scikitimage != null && scikitlearn != null + && scipy != null && matplotlib != null && youtube-dl != null); + buildPythonPackage rec { pname = "moviepy"; version = "1.0.0"; + disabled = !(pythonAtLeast "3.4"); + src = fetchPypi { inherit pname version; sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d"; }; - # No tests + # No tests, require network connection doCheck = false; - propagatedBuildInputs = [ numpy decorator imageio tqdm ]; + + propagatedBuildInputs = [ + numpy decorator imageio imageio-ffmpeg tqdm requests proglog + ] ++ (stdenv.lib.optionals advancedProcessing [ + opencv scikitimage scikitlearn scipy matplotlib youtube-dl + ]); meta = with stdenv.lib; { description = "Video editing with Python"; diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix new file mode 100644 index 000000000000..d6fe22e17545 --- /dev/null +++ b/pkgs/development/python-modules/proglog/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage, tqdm }: + +buildPythonPackage rec { + pname = "proglog"; + version = "0.1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "13diln950wk6nnn4rpmzx37rvrnpa7f803gwygiwbq1q46zwri6q"; + }; + + propagatedBuildInputs = [ tqdm ]; + + meta = with stdenv.lib; { + description = "Logs and progress bars manager for Python"; + homepage = https://github.com/Edinburgh-Genome-Foundry/Proglog; + license = licenses.mit; + }; +} |