Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overrides: add build system for cachecontrol and notebook #1279

Merged
merged 2 commits into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion overrides/build-systems.json
Original file line number Diff line number Diff line change
Expand Up @@ -2592,7 +2592,14 @@
"setuptools"
],
"cachecontrol": [
"setuptools"
{
"buildSystem": "setuptools",
"until": "0.13.1"
},
{
"buildSystem": "flit-core",
"from": "0.13.1"
}
],
"cached-property": [
"setuptools"
Expand Down
15 changes: 15 additions & 0 deletions overrides/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down