From 78169ec02089d3d18afcfff24d66b9c93f8ba0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 5 May 2013 14:38:31 +0200
Subject: [PATCH] spyder: add recommended and optional dependencies

Spyder says about itself that it has

  ...the support of IPython (enhanced interactive Python interpreter) and
  popular Python libraries such as NumPy (linear algebra), SciPy (signal
  and image processing) or matplotlib (interactive 2D/3D plotting).

So I think having those available as default is a the right thing to to.
(We can easily make a stripped down spyder expression if needed later.)

I've added the list of recommended and optional dependencies as
described here:

  http://pythonhosted.org/spyder/installation.html#dependencies
---
 pkgs/applications/science/spyder/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix              |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 772a25ed4a1..30ef9f0efbc 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, unzip, sphinx, pyside }:
+{ stdenv, fetchurl, unzip, buildPythonPackage
+# mandatory
+, pyside
+# recommended
+, pyflakes ? null, rope ? null, sphinx ? null, numpy ? null, scipy ? null, matplotlib ? null
+# optional
+, ipython ? null, pylint ? null, pep8 ? null
+}:
 
 buildPythonPackage rec {
   name = "spyder-2.1.13.1";
@@ -9,8 +16,9 @@ buildPythonPackage rec {
     sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya";
   };
 
-  buildInputs = [ unzip sphinx ];
-  propagatedBuildInputs = [ pyside ];
+  buildInputs = [ unzip ];
+  propagatedBuildInputs =
+    [ pyside pyflakes rope sphinx numpy scipy matplotlib ipython pylint pep8 ];
 
   # There is no test for spyder
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3a7f03e14b..623f1b2c717 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8721,7 +8721,8 @@ let
   gravit = callPackage ../applications/science/astronomy/gravit { };
 
   spyder = callPackage ../applications/science/spyder {
-    inherit (pythonPackages) sphinx;
+    inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
+    inherit (pythonPackages) ipython pylint pep8; # optional
   };
 
   stellarium = callPackage ../applications/science/astronomy/stellarium { };