From 3c10e8111d44ef81d193f4abe8650ef198f76ea4 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 15 Jan 2025 23:49:46 -0500
Subject: [PATCH] Infini-DL360/jupyter: fix breaking nixpkgs change

---
 hosts/Infini-DL360/jupyter.nix | 35 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/hosts/Infini-DL360/jupyter.nix b/hosts/Infini-DL360/jupyter.nix
index bc79f44..71d7ebc 100644
--- a/hosts/Infini-DL360/jupyter.nix
+++ b/hosts/Infini-DL360/jupyter.nix
@@ -10,24 +10,6 @@ let
     logo64 = "${env}/${env.sitePackages}/ipykernel/resources/logo-64x64.png";
   };
 
-  jupyterEnv = pkgs.python3.withPackages (p: with p; [
-    jupyterlab
-
-    # extensions
-    jupyterlab-lsp
-    jupyterlab-myst
-    jupyterlab-pygments
-    jupyterlab-vim
-
-    # export
-    nbconvert
-    nbformat
-
-    # lsp
-    python-lsp-server
-    python-lsp-ruff
-  ]);
-
   jupyterPath = with pkgs; [
     # export
     pandoc
@@ -49,7 +31,22 @@ in
 {
   services.jupyter = {
     enable = true;
-    package = jupyterEnv;
+    package = pkgs.python3.pkgs.jupyterlab;
+    extraPackages = with pkgs.python3.pkgs; [
+      # extensions
+      jupyterlab-lsp
+      jupyterlab-myst
+      jupyterlab-pygments
+      jupyterlab-vim
+
+      # export
+      nbconvert
+      nbformat
+
+      # lsp
+      python-lsp-server
+      python-lsp-ruff
+    ];
 
     # Hosted behind Tailscale, so security doesn't matter
     command = "jupyter-lab --ServerApp.token='' --ServerApp.password=''";