From 04f051d79fb4fcce842eff0c0eb90dc5ca8d8c70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:45:03 +0100
Subject: [PATCH] spyder: 3.2.8 -> 3.3.3

---
 pkgs/applications/science/spyder/default.nix | 42 +++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 71def712db6..417d5544d6c 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,22 +1,44 @@
 { stdenv, python3, makeDesktopItem }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+
+  spyder-kernels = with python3.pkgs; buildPythonPackage rec {
+    pname = "spyder-kernels";
+    version = "0.4.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
+    };
+
+    propagatedBuildInputs = [
+      cloudpickle
+      ipykernel
+      wurlitzer
+    ];
+
+    # No tests
+    doCheck = false;
+
+    meta = {
+      description = "Jupyter kernels for Spyder's console";
+      homepage = https://github.com/spyder-ide/spyder-kernels;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+in python3.pkgs.buildPythonApplication rec {
   pname = "spyder";
-  version = "3.2.8";
+  version = "3.3.3";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
+    sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
   };
 
-  # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
-  postPatch = ''
-    sed -i -e '/pyqt5/d' setup.py
-  '';
-
   propagatedBuildInputs = with python3.pkgs; [
-    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
-    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
+    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
   ];
 
   # There is no test for spyder