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.

Sign up for GitHub

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

Jump to bottom

Updated Jupyterlab #451

Merged
merged 4 commits into from
Mar 8, 2023
Merged

Updated Jupyterlab #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01719d4
Update: bumpup jupyterlab
GTrunSec Mar 6, 2023
37e5eae
Merge branch 'main' into jupyterlab-update
GTrunSec Mar 6, 2023
3d103bc
Update lib/jupyter.nix
garbas Mar 6, 2023
5948d4e
jupyterlab: Update overrdies
GTrunSec Mar 6, 2023
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
4 changes: 2 additions & 2 deletions lib/jupyter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
editablePackageSources ? {},
extraPackages ? (ps: []),
preferWheels ? false,
# groups ? ["devs"], # TODO: add groups after updating to latest poetry2nix. make sure to inherit below
groups ? [],
}: let
jupyterlabEnvBase = pkgs.poetry2nix.mkPoetryEnv {
inherit
Expand Down Expand Up @@ -184,7 +184,7 @@
--set JUPYTERLAB_DIR .jupyter/lab/share/jupyter/lab \
--set JUPYTERLAB_SETTINGS_DIR ".jupyter/lab/user-settings" \
--set JUPYTERLAB_WORKSPACES_DIR ".jupyter/lab/workspaces" \
--set JUPYTER_PATH ${lib.concatStringsSep ":" kernelDerivations} \
--set JUPYTER_PATH "${lib.concatStringsSep ":" kernelDerivations}" \
--set JUPYTER_CONFIG_DIR "${jupyterDir}/config" \
--set JUPYTER_DATA_DIR ".jupyter/data" \
--set IPYTHONDIR "/path-not-set" \
Expand Down
25 changes: 14 additions & 11 deletions lib/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@ pkgs: let
});
};

# A fix is on the way soon, https://github.com/nix-community/poetry2nix/pull/787
preOverlay = final: prev: {
babel = null;
Babel = null;
babel_ = prev.babel.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [final.setuptools];
});
y-py = prev.y-py.override {
preferWheel = true;
};
};

postOverlay = final: prev:
{}
// {
babel = prev.babel_;
Babel = prev.babel_;
testbook = prev.testbook.overridePythonAttrs (old: {
postPatch = ''
mkdir ./tmp
Expand All @@ -31,6 +26,14 @@ pkgs: let
rm -rf tmp
'';
});
};
in
(pkgs.poetry2nix.defaultPoetryOverrides.overrideOverlay preOverlay).extend postOverlay
}
// addNativeBuildInputs prev "rfc3986-validator" [final.setuptools final.pytest-runner]
// addNativeBuildInputs prev "jupyter-server-terminals" [final.hatchling]
// addNativeBuildInputs prev "jupyter-events" [final.hatchling]
// addNativeBuildInputs prev "jupyter-server-fileid" [final.hatchling]
// addNativeBuildInputs prev "jupyter-server" [final.hatchling final.hatch-jupyter-builder]
// addNativeBuildInputs prev "jupyter-server-ydoc" [final.hatchling]
// addNativeBuildInputs prev "ypy-websocket" [final.hatchling]
// addNativeBuildInputs prev "pathspec" [final.flit-core]
// addNativeBuildInputs prev "jupyter-ydoc" [final.hatchling];
in [preOverlay pkgs.poetry2nix.defaultPoetryOverrides postOverlay]
Loading