From 54e502272886f23434306f0aeec60d1802b694be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 5 Sep 2017 09:32:04 +0200
Subject: [PATCH] python.pkgs.bokeh: 0.12.3 -> 0.12.7

---
 .../python-modules/bokeh/default.nix          | 82 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 48 +----------
 2 files changed, 83 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/python-modules/bokeh/default.nix

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
new file mode 100644
index 00000000000..43c176a09ec
--- /dev/null
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -0,0 +1,82 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, mock
+, pytest
+, flask
+, jinja2
+, markupsafe
+, werkzeug
+, itsdangerous
+, dateutil
+, requests
+, six
+, pygments
+, pystache
+, markdown
+, pyyaml
+, pyzmq
+, tornado
+, colorama
+, isPy3k
+, futures
+, websocket_client
+, numpy
+, pandas
+, greenlet
+, python
+, bkcharts
+, pillow
+, selenium
+}:
+
+buildPythonPackage rec {
+  pname = "bokeh";
+  name = "${pname}${version}";
+  version = "0.12.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880";
+  };
+
+  disabled = isPyPy;
+
+  # Some test that uses tornado fails
+#   doCheck = false;
+
+  checkInputs = [ mock pytest pillow selenium ];
+
+  propagatedBuildInputs = [
+    flask
+    jinja2
+    markupsafe
+    werkzeug
+    itsdangerous
+    dateutil
+    requests
+    six
+    pygments
+    pystache
+    markdown
+    pyyaml
+    pyzmq
+    tornado
+    colorama
+    bkcharts
+  ]
+  ++ lib.optionals ( !isPy3k ) [ futures ]
+  ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
+  ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s bokeh/tests
+  '';
+
+  meta = {
+    description = "Statistical and novel interactive HTML plots for Python";
+    homepage = "http://github.com/bokeh/bokeh";
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22a1b8e3531..759a9ed2250 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2106,55 +2106,9 @@ in {
     };
   };
 
-  bokeh = buildPythonPackage rec {
-    name = "bokeh-${version}";
-    version = "0.12.3";
   bkcharts = callPackage ../development/python-modules/bkcharts { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bokeh/${name}.tar.gz";
-      sha256 = "e138941b62f59bc48bc5b8d249e90c03fed31c1d5abe47ab2ce9e4c83202f73c";
-    };
-
-    disabled = isPyPy;
-
-    # Some test that uses tornado fails
-    doCheck = false;
-
-    buildInputs = with self; [ mock pytest ];
-
-    propagatedBuildInputs = with self; [
-      flask
-      jinja2
-      markupsafe
-      werkzeug
-      itsdangerous
-      dateutil
-      requests
-      six
-      pygments
-      pystache
-      markdown
-      pyyaml
-      pyzmq
-      tornado
-      colorama
-      ]
-      ++ optionals ( !isPy3k ) [ futures ]
-      ++ optionals ( isPy26 ) [ argparse ]
-      ++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
-      ++ optionals ( !isPyPy ) [ numpy pandas greenlet ];
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover -s bokeh/tests
-    '';
-
-    meta = {
-      description = "Statistical and novel interactive HTML plots for Python";
-      homepage = "http://github.com/bokeh/bokeh";
-      license = licenses.bsd3;
-    };
-  };
+  bokeh = callPackage ../development/python-modules/bokeh { };
 
   boto = buildPythonPackage rec {
     name = "boto-${version}";