diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index e2c080896..3c315c02b 100644
--- a/overrides/build-systems.json
+++ b/overrides/build-systems.json
@@ -2592,7 +2592,14 @@
     "setuptools"
   ],
   "cachecontrol": [
-    "setuptools"
+    {
+      "buildSystem": "setuptools",
+      "until": "0.13.1"
+    },
+    {
+      "buildSystem": "flit-core",
+      "from": "0.13.1"
+    }
   ],
   "cached-property": [
     "setuptools"
diff --git a/overrides/default.nix b/overrides/default.nix
index 615fc5226..8b6f54765 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -1509,6 +1509,21 @@ lib.composeManyExtensions [
         }
       );
 
+      notebook =
+        if (lib.versionAtLeast super.notebook.version "7.0.0") then
+          super.notebook.overridePythonAttrs
+            (old: ({
+              buildInputs = (old.buildInputs or [ ]) ++ [
+                super.hatchling
+                super.hatch-jupyter-builder
+              ];
+              # notebook requires jlpm which is in jupyterlab
+              # https://github.com/jupyterlab/jupyterlab/blob/main/jupyterlab/jlpmapp.py
+              nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+                super.jupyterlab
+              ];
+            })) else super.notebook;
+
       # The following are dependencies of torch >= 2.0.0.
       # torch doesn't officially support system CUDA, unless you build it yourself.
       nvidia-cudnn-cu11 = super.nvidia-cudnn-cu11.overridePythonAttrs (attrs: {