From 72573bde2dfb6f564e2882809582488934f73f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?=
 <65301509+KiruyaMomochi@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:35:59 +0800
Subject: [PATCH 1/2] overrides/build-systems: cachecontrol

---
 overrides/build-systems.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index bb9506d14..e235c4574 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"

From 8f0a19ab4a485d95035cdb2ada4c57c360390852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?=
 <65301509+KiruyaMomochi@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:53:01 +0800
Subject: [PATCH 2/2] overrides: add notebook 7.0.0

---
 overrides/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/overrides/default.nix b/overrides/default.nix
index 7c5908c16..221a988ef 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: {