From 026073e57ebcc3d9b314339bd8b5a847013f795c Mon Sep 17 00:00:00 2001
From: Marcus Boyd <mwb@geosol.com.au>
Date: Wed, 6 May 2020 16:01:17 +0930
Subject: [PATCH] python3Packages.spyder_3: remove broken application

Previously this had makeDesktopItem defined in it. Some recent tests
enabled for this option made it fail. It's no longer used as an
application (see the main spyder attribute for that), so all application
aspects have been removed.
---
 pkgs/development/python-modules/spyder/3.nix | 52 ++++++--------------
 1 file changed, 14 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix
index 7987775cee1d..e5c5683f5dc4 100644
--- a/pkgs/development/python-modules/spyder/3.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@@ -1,62 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
-  psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
+{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
+  psutil, pyflakes, rope, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
-  spyder-kernels_0_5, qtpy, pyzmq, chardet
-, pyqtwebengine
+  spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine
 }:
 
 buildPythonPackage rec {
   pname = "spyder";
   version = "3.3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
+  src = fetchFromGitHub {
+    owner = "spyder-ide";
+    repo = "spyder";
+    rev = "v3.3.6";
+    sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6";
   };
 
-  nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
-
   propagatedBuildInputs = [
-    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
-    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
+    jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc 
+    qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
     pygments qtpy pyzmq chardet pyqtwebengine
   ];
 
-  # There is no test for spyder
+  # tests fail with a segfault
   doCheck = false;
 
-  desktopItem = makeDesktopItem {
-    name = "Spyder";
-    exec = "spyder";
-    icon = "spyder";
-    comment = "Scientific Python Development Environment";
-    desktopName = "Spyder";
-    genericName = "Python IDE";
-    categories = "Application;Development;Editor;IDE;";
-  };
-
   postPatch = ''
     # remove dependency on pyqtwebengine
-    # this is still part of the pyqt 5.11 version we have in nixpkgs
+    # this is still part of the pyqt 5.13 version we have in nixpkgs
     sed -i /pyqtwebengine/d setup.py
     substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
   '';
 
-  # Create desktop item
-  postInstall = ''
-    mkdir -p $out/share/icons
-    cp spyder/images/spyder.svg $out/share/icons
-    cp -r $desktopItem/share/applications/ $out/share
-  '';
-
-  dontWrapQtApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-  '';
-
   meta = with stdenv.lib; {
-    description = "Scientific python development environment";
+    description = "Library providing a scientific python development environment";
     longDescription = ''
       Spyder (previously known as Pydee) is a powerful interactive development
       environment for the Python language with advanced editing, interactive
@@ -65,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/spyder-ide/spyder/";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner marcus7070 ];
   };
 }