summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-02-04 13:29:23 +0000
committerGitHub <noreply@github.com>2018-02-04 13:29:23 +0000
commitc1d79509a0b0563ba4f2498a55ecaa326188d665 (patch)
tree17d34e7b07ada6939de930d1a770f47c605cf07b /pkgs/applications/science
parent34b7ea6d45af9ff0634ececaac653228ee0d6139 (diff)
parentaaa50d506e7170a1681efa0d567e058ccc084783 (diff)
downloadnixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar.gz
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar.bz2
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar.lz
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar.xz
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.tar.zst
nixlib-c1d79509a0b0563ba4f2498a55ecaa326188d665.zip
Merge pull request #34553 from NixOS/python-unstable
Python package updates
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/spyder/default.nix18
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 0952b61551e3..04a5def81e69 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem
 # mandatory
-, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, sphinx, nbconvert, mccabe
+, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
+, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle
 # optional
 , numpy ? null, scipy ? null, matplotlib ? null
 # optional
@@ -10,17 +10,21 @@
 
 buildPythonApplication rec {
   pname = "spyder";
-  version = "3.2.4";
-  namePrefix = "";
+  version = "3.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3";
+    sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a";
   };
 
+  # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
+  postPatch = ''
+    substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' '
+  '';
+
   propagatedBuildInputs = [
-    jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint
-    numpydoc qtconsole qtawesome nbconvert mccabe
+    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
   ];
 
   # There is no test for spyder