jupyterlab: Update overrdies

tweag · Mar 6, 2023 · 5948d4e · 5948d4e
1 parent 3d103bc
commit 5948d4e
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 113 deletions.
diff --git a/lib/jupyter.nix b/lib/jupyter.nix
@@ -24,7 +24,7 @@
     editablePackageSources ? {},
     extraPackages ? (ps: []),
     preferWheels ? false,
-    # groups ? ["devs"], # TODO: add groups after updating to latest poetry2nix. make sure to inherit below
+    groups ? [],
   }: let
     jupyterlabEnvBase = pkgs.poetry2nix.mkPoetryEnv {
       inherit

diff --git a/lib/overrides.nix b/lib/overrides.nix
@@ -5,7 +5,11 @@ pkgs: let
     });
   };
 
-  preOverlay = final: prev: {};
+  preOverlay = final: prev: {
+    y-py = prev.y-py.override {
+      preferWheel = true;
+    };
+  };
 
   postOverlay = final: prev:
     {}
@@ -22,6 +26,14 @@ pkgs: let
           rm -rf tmp
         '';
       });
-    };
-in
-  (pkgs.poetry2nix.defaultPoetryOverrides.overrideOverlay preOverlay).extend postOverlay
+    }
+    // addNativeBuildInputs prev "rfc3986-validator" [final.setuptools final.pytest-runner]
+    // addNativeBuildInputs prev "jupyter-server-terminals" [final.hatchling]
+    // addNativeBuildInputs prev "jupyter-events" [final.hatchling]
+    // addNativeBuildInputs prev "jupyter-server-fileid" [final.hatchling]
+    // addNativeBuildInputs prev "jupyter-server" [final.hatchling final.hatch-jupyter-builder]
+    // addNativeBuildInputs prev "jupyter-server-ydoc" [final.hatchling]
+    // addNativeBuildInputs prev "ypy-websocket" [final.hatchling]
+    // addNativeBuildInputs prev "pathspec" [final.flit-core]
+    // addNativeBuildInputs prev "jupyter-ydoc" [final.hatchling];
+in [preOverlay pkgs.poetry2nix.defaultPoetryOverrides postOverlay]