From da760cf7a01a23519a8bdaf6683705a6028fb46b Mon Sep 17 00:00:00 2001
From: Marcus Boyd <mwb@geosol.com.au>
Date: Thu, 19 Mar 2020 12:01:08 +1030
Subject: [PATCH] python3Packages.spyder_3: Added spyder_3

cq-editor currently requires spyder v3.x
---
 pkgs/development/python-modules/spyder/{2.nix => 3.nix} | 4 ++--
 pkgs/top-level/python-packages.nix                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/python-modules/spyder/{2.nix => 3.nix} (96%)

diff --git a/pkgs/development/python-modules/spyder/2.nix b/pkgs/development/python-modules/spyder/3.nix
similarity index 96%
rename from pkgs/development/python-modules/spyder/2.nix
rename to pkgs/development/python-modules/spyder/3.nix
index b707d4a0abc..7987775cee1 100644
--- a/pkgs/development/python-modules/spyder/2.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
-  spyder-kernels, qtpy, pyzmq, chardet
+  spyder-kernels_0_5, qtpy, pyzmq, chardet
 , pyqtwebengine
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
-    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
     pygments qtpy pyzmq chardet pyqtwebengine
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd594153eec..28695722a92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1507,8 +1507,8 @@ in {
   spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
   spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {};
 
-  spyder = if isPy3k then callPackage ../development/python-modules/spyder {}
-    else callPackage ../development/python-modules/spyder/2.nix {};
+  spyder = callPackage ../development/python-modules/spyder {};
+  spyder_3 = callPackage ../development/python-modules/spyder/3.nix { };
 
   tenacity = callPackage ../development/python-modules/tenacity { };