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

Updated Jupyterlab #451

Merged
merged 4 commits into from
Mar 8, 2023
Merged

Updated Jupyterlab #451

Show file tree
Hide file tree
Changes from 2 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 @@ -23,7 +23,7 @@
python ? pkgs.python3,
editablePackageSources ? {},
extraPackages ? (ps: []),
preferWheels ? false,
preferWheels ? true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
preferWheels ? true,
preferWheels ? false,

Why is this needed? I'd prefer to build without wheels since that can cause some weird problems by my experience. I understand this options might be interesting for final users since it would speed things up, but for core stuff here we can be on the side of causion and build things from source.

Copy link
Collaborator Author

@GTrunSec GTrunSec Mar 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cause some weird problems

So hard to resolve some dependencies. We can override some packages for building without preferWheels, such as jupyterlab, jupyter -server.

# groups ? ["devs"], # TODO: add groups after updating to latest poetry2nix. make sure to inherit below
}: let
jupyterlabEnvBase = pkgs.poetry2nix.mkPoetryEnv {
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
11 changes: 1 addition & 10 deletions lib/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,11 @@ 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];
});
};
preOverlay = final: prev: {};

postOverlay = final: prev:
{}
// {
babel = prev.babel_;
Babel = prev.babel_;
testbook = prev.testbook.overridePythonAttrs (old: {
postPatch = ''
mkdir ./tmp
Expand Down
Loading