python-packages ipython: 3.2 -> 4.0

2 files changed, 23 insertions, 74 deletions

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
deleted file mode 100644
index 0283c48add9b..000000000000
--- a/pkgs/shells/ipython/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null
-, notebookSupport ? true   # ipython notebook
-, qtconsoleSupport ? true  # ipython qtconsole
-, pylabSupport ? true      # '%pylab' magic (backend: agg - no gui, just file)
-, pylabQtSupport ? true    # '%pylab qt' (backend: Qt4Agg - plot to window)
-}:
-
-# ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt
-# only works with pyqt4 (at least this is true for ipython 0.13.1). So just use
-# pyqt4 for both.
-
-assert qtconsoleSupport == true -> pyqt4 != null;
-assert pylabQtSupport == true -> pyqt4 != null;
-
-buildPythonPackage rec {
-  name = "ipython-${version}";
-  version = "3.2.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177";
-  };
-
-  propagatedBuildInputs = [
-    pythonPackages.readline
-    pythonPackages.sqlite3  # required for history support
-  ] ++ stdenv.lib.optionals notebookSupport [
-    pythonPackages.tornado
-    pythonPackages.pyzmq
-    pythonPackages.jinja2
-    pythonPackages.jsonschema
-  ] ++ stdenv.lib.optionals qtconsoleSupport [
-    pythonPackages.pygments
-    pythonPackages.pyzmq
-    pyqt4
-  ] ++ stdenv.lib.optionals pylabSupport [
-    pythonPackages.matplotlib
-  ] ++ stdenv.lib.optionals pylabQtSupport [
-    pythonPackages.matplotlib
-    pyqt4
-  ];
-
-  doCheck = false;
-
-  meta = {
-    homepage = http://ipython.scipy.org/;
-    description = "An interactive computing environment for Python";
-    license = stdenv.lib.licenses.bsd3;
-    longDescription = ''
-      The goal of IPython is to create a comprehensive environment
-      for interactive and exploratory computing. It consists of an
-      enhanced interactive Python shell and an architecture for
-      interactive parallel computing.
-    '';
-    maintainers = with stdenv.lib.maintainers; [ bjornfor jgeerds ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d4cbd28e2902..596c3490c2f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -120,20 +120,6 @@ let
     hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
   };
 
-  ipython = callPackage ../shells/ipython {
-    inherit pythonPackages;
-
-    qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
-    pylabQtSupport = !pkgs.stdenv.isDarwin;
-    pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
-  };
-
-  ipythonLight = lowPrio (self.ipython.override {
-    qtconsoleSupport = false;
-    pylabSupport = false;
-    pylabQtSupport = false;
-  });
-
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
@@ -6912,6 +6898,27 @@ let
     };
   };
   
+  ipython = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "ipython-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
+      sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da";
+    };
+    
+    buildInputs = with self; [nose] ++ optionals isPy27 [mock];
+    
+    propagatedBuildInputs = with self; [decorator pickleshare simplegeneric traitlets requests pexpect sqlite3];
+    
+    meta = {
+      description = "IPython: Productive Interactive Computing";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ bjornfor jgeerds ];
+    };
+  };
+  
   ipython_genutils = buildPythonPackage rec {
     version = "0.1.0";
     name = "ipython_genutils-${version}";
@@ -6967,7 +6974,7 @@ let
       url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip";
       md5 = "96dca0712efa01aa5eaf6b22071dd3ed";
     };
-    propagatedBuildInputs = with self; [ self.ipythonLight ];
+    propagatedBuildInputs = with self; [ self.ipython ];
   };
 
   ipdbplugin = buildPythonPackage {
@@ -6976,7 +6983,7 @@ let
       url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz";
       md5 = "f9a41512e5d901ea0fa199c3f648bba7";
     };
-    propagatedBuildInputs = with self; [ self.nose self.ipythonLight ];
+    propagatedBuildInputs = with self; [ self.nose self.ipython ];
   };
 
   iso8601 = buildPythonPackage {