From 80b356a9187ade10a1f90de00cb9a4815e41d8e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:19:55 +0200
Subject: [PATCH 01/17] python-packages simplegeneric: init at 0.8.1

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42db423a451..a646e361392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12603,6 +12603,22 @@ let
       license = "unspecified"; # !
     };
   };
+  
+  simplegeneric = buildPythonPackage rec {
+    version = "0.8.1";
+    name = "simplegeneric-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/simplegeneric/${name}.zip";
+      sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
+    };
+    
+    meta = {
+      description = "Simple generic functions";
+      homepage = http://cheeseshop.python.org/pypi/simplegeneric;
+      license = licenses.zpt21;
+    };
+  };
 
 
   simplejson = buildPythonPackage (rec {

From 4b12129b1e67c16ed64537239a64c5431b9f1d91 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:20:28 +0200
Subject: [PATCH 02/17] python-packages mistune: init at 0.7.1

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a646e361392..a068da3bcd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7761,6 +7761,24 @@ let
       maintainers = with maintainers; [ thoughtpolice ];
     };
   };
+  
+  mistune = buildPythonPackage rec {
+    version = "0.7.1";
+    name = "mistune-${version}";
+   
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/mistune/${name}.tar.gz";
+      sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7";
+    };
+    
+    buildInputs = with self; [nose];
+    
+    meta = {
+      decription = "The fastest markdown parser in pure Python";
+      homepage = https://github.com/lepture/mistune;
+      license = licenses.bsd3;
+    };
+  };
 
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";

From c81eed6e613d1e5562f37231d2e0d20202c9c9c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:22:53 +0200
Subject: [PATCH 03/17] python-packages pytestrunner: init at 2.6.2

---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a068da3bcd7..3cff75ea2b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2606,6 +2606,27 @@ let
        license = licenses.mit;
      };
   };
+  
+  pytestrunner = buildPythonPackage rec {
+    version = "2.6.2";
+    name = "pytest-runner-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pytest-runner/${name}.tar.gz";
+      sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb";
+    };
+    
+    buildInputs = with self; [setuptools_scm pytest];
+    
+    meta = {
+      description = "Invoke py.test as distutils command with dependency resolution";
+      homepage = https://bitbucket.org/pytest-dev/pytest-runner;
+      license = licenses.mit;
+    };
+    
+    # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration
+    doCheck = false;
+  };
 
   pytestquickcheck = buildPythonPackage rec {
     name = "pytest-quickcheck-0.8.2";

From 650116a77312ce6d2cf064b33ad630b4992fed67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:24:44 +0200
Subject: [PATCH 04/17] python-packages pathpy: 5.2 -> 7.6

Note that tests fail because of apparently a bug in the dependency
pytestrunner.

The latest version of pathpy is 8.0. However, that version breaks the qtconsole.
---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3cff75ea2b5..0464197a7ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9259,19 +9259,27 @@ let
   };
 
   pathpy = buildPythonPackage rec {
-    name = "path.py-5.2";
+    version = "7.6";
+    name = "path.py-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip";
-      sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq";
+      url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz";
+      sha256 = "5cdf60f359f1add18f8556c9a1855cbd1d517f0780e3d386c256515f698ba0e0";
     };
-
+    
+    buildInputs = with self; [setuptools_scm pytestrunner pytest];
+    
     meta = {
       description = "A module wrapper for os.path";
       homepage = http://github.com/jaraco/path.py;
       license = licenses.mit;
       platforms = platforms.linux;
     };
+    
+    # Test fails with python 2.7: TestUnicodePaths.test_walkdirs_with_unicode_name
+    # Also during tests with python 3.4: RuntimeError: dictionary changed size during iteration
+    # Caused by pytestrunner
+    doCheck = false;
   };
 
   paypalrestsdk = buildPythonPackage rec {

From d0f947cfc4fdab63b1adfc57c8367b7b4db30d04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:25:19 +0200
Subject: [PATCH 05/17] python-packages pickleshare: init at 0.5

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0464197a7ea..8566e7b14b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9529,6 +9529,24 @@ let
     };
   };
 
+  pickleshare = buildPythonPackage rec {
+    version = "0.5";
+    name = "pickleshare-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pickleshare/${name}.tar.gz";
+      sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286";
+    };
+    
+    propagatedBuildInputs = with self; [pathpy];
+    
+    meta = {
+      description = "Tiny 'shelve'-like database with concurrency support";
+      homepage = https://github.com/vivainio/pickleshare;
+      license = licenses.mit;
+    };
+  };
+  
   pip = buildPythonPackage rec {
     version = "1.5.6";
     name = "pip-${version}";

From 12e9aaf7538b17d2814cedef283f9b0565ee6574 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:27:36 +0200
Subject: [PATCH 06/17] python-packages ipython_genutils: init at 0.1.0

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8566e7b14b0..baebd643392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6911,6 +6911,22 @@ let
       homepage = http://pypi.python.org/pypi/IPy;
     };
   };
+  
+  ipython_genutils = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "ipython_genutils-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipython_genutils/${name}.tar.gz";
+      sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
+    };
+    
+    meta = {
+      description = "Vestigial utilities from IPython";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
 
 
   ipaddr = buildPythonPackage rec {

From 470c99125aa5f09b167c161ef62d3874d3dafcd2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:28:06 +0200
Subject: [PATCH 07/17] python-packages traitlets: init at 4.0.0

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index baebd643392..cb05ebd5700 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13880,6 +13880,23 @@ let
     };
   };
 
+  traitlets = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "traitlets-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz";
+      sha256 = "0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils decorator];
+    
+    meta = {
+      description = "Traitlets Python config system";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   python_mimeparse = buildPythonPackage rec {
     name = "python-mimeparse-${version}";

From 2669bf2005f7a6e612c6d223046532355063bc32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:30:03 +0200
Subject: [PATCH 08/17] python-packages jupyter_core: init at 4.0.4

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb05ebd5700..d4cbd28e290 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7138,6 +7138,24 @@ let
       license = licenses.mit;
     };
   };
+  
+  jupyter_core = buildPythonPackage rec {
+    version = "4.0.4";
+    name = "jupyter_core-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter_core/${name}.tar.gz";
+      sha256 = "fcf45478025f34174943993947f51a41ad871ac998a14bf1cb87d8eb61e75c6d";
+    };
+    
+    propagatedBuildInputs = with self; [traitlets];
+    
+    meta = {
+      description = "Jupyter core package. A base package on which Jupyter projects rely";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
 
   keyring = buildPythonPackage rec {

From 3ccedc7630a12429016f1ec2c5ee447bb659bfa8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:31:32 +0200
Subject: [PATCH 09/17] python-packages ipython: 3.2 -> 4.0

---
 pkgs/shells/ipython/default.nix    | 58 ------------------------------
 pkgs/top-level/python-packages.nix | 39 +++++++++++---------
 2 files changed, 23 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/shells/ipython/default.nix

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
deleted file mode 100644
index 0283c48add9..00000000000
--- 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 d4cbd28e290..596c3490c2f 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 {

From e9407cda10bd3c97cb3b27e5b225572205555f44 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:31:52 +0200
Subject: [PATCH 10/17] python-packages ipykernel: init at 4.0.3

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 596c3490c2f..d8b28dac180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6898,6 +6898,24 @@ let
     };
   };
   
+  ipykernel = buildPythonPackage rec {
+    version = "4.0.3";
+    name = "ipykernel-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz";
+      sha256 = "a4d7d2d35a0af432c8391872cb4dae727d77031212f32ca858b5c84cd0ea821f";
+    };
+    
+    buildInputs = with self; [] ++ optionals isPy27 [mock];
+    propagatedBuildInputs = with self; [ipython traitlets jupyter_client pexpect];
+    
+    meta = {
+      description = "IPython Kernel for Jupyter";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
   ipython = buildPythonPackage rec {
     version = "4.0.0";
     name = "ipython-${version}";

From 86137992f796eb531d24e6f2b6a8131cf03b174c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:32:20 +0200
Subject: [PATCH 11/17] python-packages jupyter_client: init at 4.0.0

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8b28dac180..5afbde5275e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7164,6 +7164,24 @@ let
     };
   };
   
+  jupyter_client = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "jupyter_client-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter_client/${name}.tar.gz";
+      sha256 = "a39a4181ea2021daf6e821acae836999ef6e0fefe603813a7a7d4658d2ffa2ac";
+    };
+        
+    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py;
+    
+    meta = {
+      description = "Jupyter protocol implementation and client libraries";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };  
+  };
+  
   jupyter_core = buildPythonPackage rec {
     version = "4.0.4";
     name = "jupyter_core-${version}";

From 529083ae67f032ce8d5c2f9927f8920e15612180 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:33:23 +0200
Subject: [PATCH 12/17] python-packages qtconsole: init at 4.0.1

The qtconsole used to be part of the ipython package.
---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5afbde5275e..4d5e0559e32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12003,6 +12003,25 @@ let
       license = licenses.bsd3;
     };
   };
+  
+  qtconsole = buildPythonPackage rec {
+    version = "4.0.1";
+    name = "qtconsole-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz";
+      sha256 = "7d2cf976bb960df11f413709b5b5b809365c48426110e946d0c12117e6ced3a5";
+    };
+    
+    buildInputs = with self; [] ++ optionals isPy27 [mock];
+    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
+    
+    meta = {
+      description = "Jupyter Qt console";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   quantities = buildPythonPackage rec {
     name = "quantities-0.10.1";

From 70dddefc96a215224e40e6be4eec5cb06b9643d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:07 +0200
Subject: [PATCH 13/17] python-packages notebook: init at 4.0.4

The Jupyter notebook used to be part of ipython
---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d5e0559e32..23fc8fce5ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8674,7 +8674,26 @@ let
 
     buildInputs = with self; [ nose ];
   };
-
+  
+  notebook = buildPythonPackage rec {
+    version = "4.0.4";
+    name = "notebook-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz";
+      sha256 = "a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648";
+    };
+    
+    buildInputs = with self; [nose]  ++ optionals isPy27 [mock];
+    
+    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests pexpect];
+    
+    meta = {
+      description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";

From 2e27fdab1fa2e4b27dd9c18b37b3e7c146c738f2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:23 +0200
Subject: [PATCH 14/17] python-packages nbformat: init at 4.0.0

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23fc8fce5ff..911f9fc46e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8351,6 +8351,23 @@ let
       license = licenses.lgpl21Plus;
     };
   };
+  nbformat = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "nbformat-${version}";
+  
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nbformat/${name}.tar.gz";
+      sha256 = "daf9b990e96863d120aff123361156a316757757b81a8070eb6945e4a9774b2d";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core];
+    
+    meta = {
+      description = "The Jupyter Notebook format";
+      homepage = "http://jupyter.org/";
+      license = licenses.bsd3;
+    };
+  };
 
   nbxmpp = buildPythonPackage rec {
     name = "nbxmpp-0.5.3";

From 4aed6b2d294819a70166a95f3fe097a0e49c0506 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:37 +0200
Subject: [PATCH 15/17] python-packages nbconvert: init at 4.0.0

---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 911f9fc46e2..b94219f4e66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8351,6 +8351,27 @@ let
       license = licenses.lgpl21Plus;
     };
   };
+  
+  nbconvert = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "nbconvert-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz";
+      sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437";
+    };
+    
+    buildInputs = with self; [nose];
+    
+    propagatedBuildInputs = with self; [mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client];
+    
+    meta = {
+      description = "Converting Jupyter Notebooks";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    }; 
+  };
+  
   nbformat = buildPythonPackage rec {
     version = "4.0.0";
     name = "nbformat-${version}";

From df8ddf9809296352140c3729280d65854850118b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:52 +0200
Subject: [PATCH 16/17] python-packages ipyparallel: init at 4.0.2

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b94219f4e66..ca2454e981b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6916,6 +6916,26 @@ let
       license = licenses.bsd3;
     };
   };
+  
+  ipyparallel = buildPythonPackage rec {
+    version = "4.0.2";
+    name = "ipyparallel-${version}";
+    
+    src = pkgs.fetchurl { 
+      url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz";
+      sha256 = "6b9e09ca441a45e055b97cb8e3e1dd30de85b935fae3aa0d97f138352fd3089b";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel];
+    
+    meta = {
+      description = "Interactive Parallel Computing with IPython";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  
+  };
+  
   ipython = buildPythonPackage rec {
     version = "4.0.0";
     name = "ipython-${version}";

From fb5f7832d99477d0fdccfd19f57982f0ae235cf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 15 Aug 2015 09:23:04 +0200
Subject: [PATCH 17/17] gnome 3.16 accersiser: change ipythonLight to ipython

---
 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
index c8d33c24156..a2813e0581b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
-    python3Packages.pygobject3 python3Packages.ipythonLight
+    python3Packages.pygobject3 python3Packages.ipython
     at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
   ];