From 636c6344433d3e0941b9f03216a26df057761cc7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 7 Apr 2018 18:43:24 +0100
Subject: [PATCH 1/4] pythonPackages.jupyterlab_launcher: init at 0.10.5

---
 .../jupyterlab_launcher/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupyterlab_launcher/default.nix

diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
new file mode 100644
index 00000000000..f316fe10563
--- /dev/null
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
+buildPythonPackage rec {
+  pname = "jupyterlab_launcher";
+  version = "0.10.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7";
+  };
+
+  propagatedBuildInputs = [
+    jsonschema
+    notebook
+  ];
+
+  # depends on requests and a bunch of other libraries
+  doCheck = false;
+
+  meta = with lib; {
+    description = "This package is used to launch an application built using JupyterLab";
+    license = with licenses; [ bsd3 ];
+    homepage = "http://jupyter.org/";
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5c453378ea..4ad40af8145 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3449,6 +3449,8 @@ in {
 
   jupyter_console = callPackage ../development/python-modules/jupyter_console { };
 
+  jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
+
   jupyterlab = buildPythonPackage rec {
     name = "jupyterlab-${version}";
     version = "0.4.1";

From 878ca5b68e735e3ba6feb26fe92d648bedfb9ee1 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 7 Apr 2018 19:00:09 +0100
Subject: [PATCH 2/4] python3Packages.jupyterlab: 0.4.1 -> 0.31.12

---
 .../python-modules/jupyterlab/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +--------------
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/jupyterlab/default.nix

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
new file mode 100644
index 00000000000..7717ff24a81
--- /dev/null
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
+buildPythonPackage rec {
+  pname = "jupyterlab";
+  version = "0.31.12";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz";
+  };
+
+  propagatedBuildInputs = [
+    ipython_genutils
+    jupyterlab_launcher
+    notebook
+  ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Jupyter lab environment notebook server extension.";
+    license = with licenses; [ bsd3 ];
+    homepage = "http://jupyter.org/";
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ad40af8145..fc30394f3f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3451,26 +3451,7 @@ in {
 
   jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
 
-  jupyterlab = buildPythonPackage rec {
-    name = "jupyterlab-${version}";
-    version = "0.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jupyterlab/${name}.tar.gz";
-      sha256 = "91dc4d7dfb1e6ab97e28d6e3a2fc38f5f65d368201c00fd0ed077519258e67bb";
-    };
-
-    propagatedBuildInputs = with self; [ notebook ];
-
-    # No tests in archive
-    doCheck = false;
-
-    meta = {
-      description = "Jupyter lab environment notebook server extension.";
-      license = with licenses; [ bsd3 ];
-      homepage = "http://jupyter.org/";
-    };
-  };
+  jupyterlab = callPackage ../development/python-modules/jupyterlab {};
 
   PyLTI = callPackage ../development/python-modules/pylti { };
 

From 2e18f1661b5b1e316cb4d9f4468cc3f7b0e015a3 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 7 Apr 2018 22:14:08 +0100
Subject: [PATCH 3/4] Update default.nix

---
 pkgs/development/python-modules/jupyterlab/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 7717ff24a81..6e942a6286f 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     notebook
   ];
 
-  # No tests in archive
+  # Depends on npm
   doCheck = false;
 
   meta = with lib; {

From 48bc430dea3a5ad7c89edb28d4aa19fe25a78124 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 9 Apr 2018 15:17:42 +0100
Subject: [PATCH 4/4] jupyterlab: fix JUPYTERLAB_DIR lookup

without this option jupyterlab will look into the system python installation directories
---
 pkgs/development/python-modules/jupyterlab/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 6e942a6286f..4cf69a1114e 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -15,6 +15,10 @@ buildPythonPackage rec {
     notebook
   ];
 
+  makeWrapperArgs = [
+    "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
+  ];
+
   # Depends on npm
   doCheck = false;