Merge pull request #61812 from gebner/spyder334

spyder: 3.3.3 -> 3.3.4, convert to python modules

pkgs/development/python-modules/spyder-kernels/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
+  jupyter_client, pyzmq }:
+
+buildPythonPackage rec {
+  pname = "spyder-kernels";
+  version = "0.4.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r";
+  };
+
+  propagatedBuildInputs = [
+    cloudpickle
+    ipykernel
+    wurlitzer
+    jupyter_client
+    pyzmq
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Jupyter kernels for Spyder's console";
+    homepage = "https://github.com/spyder-ide/spyder-kernels";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gebner ];
+  };
+}

pkgs/development/python-modules/spyder/default.nix

@@ -1,44 +1,21 @@
-{ stdenv, python3, makeDesktopItem }:
+{ 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 }:
 
-let
+buildPythonPackage rec {
-
+  pname = "spyder";
-  spyder-kernels = with python3.pkgs; buildPythonPackage rec {
+  version = "3.3.4";
-    pname = "spyder-kernels";
-    version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-      sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
+    sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra";
   };
 
   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.3.3";
-
-  src = python3.pkgs.fetchPypi {
-    inherit pname version;
-    sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
     jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
+    pygments qtpy pyzmq chardet
   ];
 
   # There is no test for spyder
@@ -54,6 +31,12 @@ in python3.pkgs.buildPythonApplication rec {
     categories = "Application;Development;Editor;IDE;";
   };
 
+  postPatch = ''
+    # remove dependency on pyqtwebengine
+    # this is still part of the pyqt 5.11 version we have in nixpkgs
+    sed -i /pyqtwebengine/d setup.py
+  '';
+
   # Create desktop item
   postInstall = ''
     mkdir -p $out/share/icons
@@ -68,8 +51,9 @@ in python3.pkgs.buildPythonApplication rec {
       environment for the Python language with advanced editing, interactive
       testing, debugging and introspection features.
     '';
-    homepage = https://github.com/spyder-ide/spyder/;
+    homepage = "https://github.com/spyder-ide/spyder/";
     license = licenses.mit;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ gebner ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -22873,7 +22873,7 @@ in
 
   simgrid = callPackage ../applications/science/misc/simgrid { };
 
-  spyder = callPackage ../applications/science/spyder { };
+  spyder = with python3.pkgs; toPythonApplication spyder;
 
   openspace = callPackage ../applications/science/astronomy/openspace { };
 

pkgs/top-level/python-packages.nix

@@ -932,6 +932,9 @@ in {
 
   sniffio = callPackage ../development/python-modules/sniffio { };
 
+  spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
+  spyder = callPackage ../development/python-modules/spyder {};
+
   tenacity = callPackage ../development/python-modules/tenacity { };
 
   tokenserver = callPackage ../development/python-modules/tokenserver {};