Merge pull request tweag#60 from tweag/extra-packages

change location of extraPackages parameter

Author: guaraqe

default.nix

@@ -1,7 +1,6 @@
 { overlays ? []
 , config ? {}
 , pkgs ? import ./nix { inherit config overlays; }
-, extraPackages ? (_: [])
 }:
 
 with (import ./lib/directory.nix { inherit pkgs; });
@@ -18,9 +17,14 @@ let
   # Default configuration.
   defaultDirectory = "${python3.jupyterlab}/share/jupyter/lab";
   defaultKernels = [ (kernels.iPythonWith {}) ];
+  defaultExtraPackages = p: [];
 
   # JupyterLab with the appropriate kernel and directory setup.
-  jupyterlabWith = { directory ? defaultDirectory, kernels ? defaultKernels }:
+  jupyterlabWith = {
+    directory ? defaultDirectory,
+    kernels ? defaultKernels,
+    extraPackages ? defaultExtraPackages
+    }:
     let
       # PYTHONPATH setup for JupyterLab
       pythonPath = python3.makePythonPath [

example/Python/local-package/shell.nix

@@ -1,8 +1,6 @@
 let
   jupyterLibPath = ../../..;
-  jupyter = import jupyterLibPath {
-    extraPackages = p: [p.hello];
-  };
+  jupyter = import jupyterLibPath {};
 
   iPythonWithPackages = jupyter.kernels.iPythonWith {
     name = "local-package";
@@ -19,6 +17,7 @@ let
 
   jupyterlabWithKernels = jupyter.jupyterlabWith {
     kernels = [ iPythonWithPackages ];
+    extraPackages = p: [p.hello];
   };
 in
   jupyterlabWithKernels.env