Update: bumpup jupyterlab

tweag · Mar 6, 2023 · 01719d4 · 01719d4
1 parent e4dac9b
commit 01719d4
Show file tree

Hide file tree

Showing 3 changed files with 899 additions and 440 deletions.
diff --git a/lib/jupyter.nix b/lib/jupyter.nix
@@ -23,7 +23,7 @@
     python ? pkgs.python3,
     editablePackageSources ? {},
     extraPackages ? (ps: []),
-    preferWheels ? false,
+    preferWheels ? true,
     # groups ? ["devs"], # TODO: add groups after updating to latest poetry2nix. make sure to inherit below
   }: let
     jupyterlabEnvBase = pkgs.poetry2nix.mkPoetryEnv {
@@ -184,7 +184,7 @@
               --set JUPYTERLAB_DIR .jupyter/lab/share/jupyter/lab \
               --set JUPYTERLAB_SETTINGS_DIR ".jupyter/lab/user-settings" \
               --set JUPYTERLAB_WORKSPACES_DIR ".jupyter/lab/workspaces" \
-              --set JUPYTER_PATH ${lib.concatStringsSep ":" kernelDerivations} \
+              --set JUPYTER_PATH "${lib.concatStringsSep ":" kernelDerivations}" \
               --set JUPYTER_CONFIG_DIR "${jupyterDir}/config" \
               --set JUPYTER_DATA_DIR ".jupyter/data" \
               --set IPYTHONDIR "/path-not-set" \

diff --git a/lib/overrides.nix b/lib/overrides.nix
@@ -5,20 +5,11 @@ pkgs: let
     });
   };
 
-  # A fix is on the way soon, https://github.com/nix-community/poetry2nix/pull/787
-  preOverlay = final: prev: {
-    babel = null;
-    Babel = null;
-    babel_ = prev.babel.overridePythonAttrs (old: {
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [final.setuptools];
-    });
-  };
+  preOverlay = final: prev: {};
 
   postOverlay = final: prev:
     {}
     // {
-      babel = prev.babel_;
-      Babel = prev.babel_;
       testbook = prev.testbook.overridePythonAttrs (old: {
         postPatch = ''
           mkdir ./tmp