Update: bumpup jupyterlab

tweag · Mar 5, 2023 · f13ff5d · f13ff5d
1 parent ea9536e
commit f13ff5d
Show file tree

Hide file tree

Showing 4 changed files with 902 additions and 440 deletions.
diff --git a/lib/jupyter.nix b/lib/jupyter.nix
@@ -15,7 +15,7 @@
     python ? pkgs.python3,
     editablePackageSources ? {},
     extraPackages ? (ps: []),
-    preferWheels ? false,
+    preferWheels ? true,
   }: let
     jupyterlabEnvBase =
       if poetryEnv == null

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

diff --git a/modules/default.nix b/modules/default.nix
@@ -85,10 +85,13 @@ in {
   config = {
     build = mkJupyterlab {
       jupyterlabEnvArgs = {
-        pkgs = config.nixpkgs;
+        pkgs = config.nixpkgs.appendOverlays [
+          self.inputs.poetry2nix.overlay
+        ];
         inherit
           (config.jupyterlab.jupyterlabEnvArgs)
           poetryEnv
+          extraPackages
           ;
       };