diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-08 12:14:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-08 12:14:07 +0100 |
commit | 50a9d51a09e558bf017b4ac9bb9b602657ee10b2 (patch) | |
tree | 4602bb02adf834b159e39717c5f6b31525eeda89 /pkgs/applications/science | |
parent | 2e6032ff75526ff6f0c2f743bb73ca6ebd4bb7f0 (diff) | |
parent | 30d031b5d8d05422586043c3f105f4d9110e4f59 (diff) | |
download | nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.gz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.bz2 nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.lz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.xz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.zst nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.zip |
Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/spyder/default.nix | 18 |
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 |