summary refs log tree commit diff
path: root/pkgs/development/python-modules/spyder
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-03 14:13:33 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-08-03 16:04:34 +0200
commit888b8c819e4b7683d9ce833601d44459425c0bce (patch)
treec27b0de0593bd9c7c9780ea4a6eabdd059be3b7a /pkgs/development/python-modules/spyder
parente65102bde72df182707298133e69513a1a79a9d4 (diff)
downloadnixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar.gz
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar.bz2
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar.lz
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar.xz
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.tar.zst
nixpkgs-888b8c819e4b7683d9ce833601d44459425c0bce.zip
pythonPackages.spyder: 3.3.4 -> 3.3.6 and fix with pyqt5 5.13
Diffstat (limited to 'pkgs/development/python-modules/spyder')
-rw-r--r--pkgs/development/python-modules/spyder/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 406cd6e8627..7222f18d5f9 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,21 +1,23 @@
 { 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, qtpy, pyzmq, chardet
+, pyqtwebengine
+}:
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "3.3.4";
+  version = "3.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra";
+    sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
   };
 
   propagatedBuildInputs = [
     jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
-    pygments qtpy pyzmq chardet
+    pygments qtpy pyzmq chardet pyqtwebengine
   ];
 
   # There is no test for spyder
@@ -35,6 +37,7 @@ buildPythonPackage rec {
     # remove dependency on pyqtwebengine
     # this is still part of the pyqt 5.11 version we have in nixpkgs
     sed -i /pyqtwebengine/d setup.py
+    substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
   '';
 
   # Create desktop item