Skip to content

Commit

Permalink
Merge pull request nix-community#1279 from KiruyaMomochi/argon2-cache…
Browse files Browse the repository at this point in the history
…-note

overrides: add build system for cachecontrol and notebook
  • Loading branch information
adisbladis authored Sep 2, 2023
2 parents d047ecb + 8f0a19a commit f6b24e8
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
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

0 comments on commit f6b24e8

Please sign in to comment.