From 0956c096164a4957644f6b9b52472b0dcb4bb8ff Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 19 Apr 2019 03:28:35 +0200
Subject: [PATCH 1/4] pythonPackages.proglog: init at 0.1.9

---
 .../python-modules/proglog/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/proglog/default.nix

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;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3e75d8e40eb..5cccf229c07e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -589,6 +589,8 @@ in {
 
   progress = callPackage ../development/python-modules/progress { };
 
+  proglog = callPackage ../development/python-modules/proglog { };
+
   pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };
 
   pymysql = callPackage ../development/python-modules/pymysql { };

From 951c5b86e9f23930b0ea0fff8fbdc89c8453e862 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 19 Apr 2019 03:31:56 +0200
Subject: [PATCH 2/4] pythonPackages.moviepy: Add deps for new version

Fixes #59857
---
 pkgs/development/python-modules/moviepy/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 693d5cf5d7f0..6e75b8ddaea7 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -4,7 +4,10 @@
 , numpy
 , decorator
 , imageio
+, imageio-ffmpeg
 , isPy3k
+, proglog
+, requests
 , tqdm
 }:
 
@@ -19,7 +22,7 @@ buildPythonPackage rec {
 
   # No tests
   doCheck = false;
-  propagatedBuildInputs = [ numpy decorator imageio tqdm ];
+  propagatedBuildInputs = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog ];
 
   meta = with stdenv.lib; {
     description = "Video editing with Python";

From 2b4bc3769c51278f8b3c3d19149ba2a09cecdb88 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 19 Apr 2019 17:10:20 +0200
Subject: [PATCH 3/4] pythonPackages.moviepy: Requires Py3.4 since 1.0.0

"only Python 3.4+ from v.1.0"
---
 pkgs/development/python-modules/moviepy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 6e75b8ddaea7..76b5e3c1b359 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, pythonAtLeast
 , numpy
 , decorator
 , imageio
@@ -15,6 +16,8 @@ buildPythonPackage rec {
   pname = "moviepy";
   version = "1.0.0";
 
+  disabled = !(pythonAtLeast "3.4");
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d";

From 64476e879b949764052b1ae1096aee1e259ca78b Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 19 Apr 2019 18:44:36 +0200
Subject: [PATCH 4/4] pythonPackages.moviepy: Add optional deps

Don't include them by default because they increase the derivation size
from ~200M to over 600M.
---
 .../python-modules/moviepy/default.nix        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 76b5e3c1b359..7171409bec84 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -10,8 +10,20 @@
 , 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";
@@ -23,9 +35,14 @@ buildPythonPackage rec {
     sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d";
   };
 
-  # No tests
+  # No tests, require network connection
   doCheck = false;
-  propagatedBuildInputs = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog ];
+
+  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";