@@ -1,62 +1,38 @@
1−{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
2− psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
1+{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
2+ psutil, pyflakes, rope, pylint, keyring, numpydoc,
33 qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
4− spyder-kernels_0_5, qtpy, pyzmq, chardet
5−, pyqtwebengine
4+ spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine
65}:
76
87buildPythonPackage rec {
98 pname = "spyder";
109 version = "3.3.6";
1110
12− src = fetchPypi {
13− inherit pname version;
14− sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
11+ src = fetchFromGitHub {
12+ owner = "spyder-ide";
13+ repo = "spyder";
14+ rev = "v3.3.6";
15+ sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6";
1516 };
1617
17− nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
18−
1918 propagatedBuildInputs = [
20− jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
21− numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
19+ jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc
20+ qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
2221 pygments qtpy pyzmq chardet pyqtwebengine
2322 ];
2423
25− # There is no test for spyder
24+ # tests fail with a segfault
2625 doCheck = false;
2726
28− desktopItem = makeDesktopItem {
29− name = "Spyder";
30− exec = "spyder";
31− icon = "spyder";
32− comment = "Scientific Python Development Environment";
33− desktopName = "Spyder";
34− genericName = "Python IDE";
35− categories = "Application;Development;Editor;IDE;";
36− };
37−
3827 postPatch = ''
3928 # remove dependency on pyqtwebengine
40− # this is still part of the pyqt 5.11 version we have in nixpkgs
29+ # this is still part of the pyqt 5.13 version we have in nixpkgs
4130 sed -i /pyqtwebengine/d setup.py
4231 substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
4332 '';
4433
45− # Create desktop item
46− postInstall = ''
47− mkdir -p $out/share/icons
48− cp spyder/images/spyder.svg $out/share/icons
49− cp -r $desktopItem/share/applications/ $out/share
50− '';
51−
52− dontWrapQtApps = true;
53−
54− preFixup = ''
55− makeWrapperArgs+=("''${qtWrapperArgs[@]}")
56− '';
57−
5834 meta = with stdenv.lib; {
59− description = "Scientific python development environment";
35+ description = "Library providing a scientific python development environment";
6036 longDescription = ''
6137 Spyder (previously known as Pydee) is a powerful interactive development
6238 environment for the Python language with advanced editing, interactive
@@ -65,6 +41,6 @@ buildPythonPackage rec {
6541 homepage = "https://github.com/spyder-ide/spyder/";
6642 license = licenses.mit;
6743 platforms = platforms.linux;
68− maintainers = with maintainers; [ gebner ];
44+ maintainers = with maintainers; [ gebner marcus7070 ];
6945 };
7046}