Skip to content

Commit

Permalink
jupyter updates 2025-01-18 (NixOS#374760)
Browse files Browse the repository at this point in the history
  • Loading branch information
natsukium authored Jan 18, 2025
2 parents 679eaae + 57ab9a1 commit ca7812d
Show file tree
Hide file tree
Showing 13 changed files with 137 additions and 107 deletions.
16 changes: 9 additions & 7 deletions pkgs/development/python-modules/bash-kernel/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
buildPythonPackage,
fetchPypi,
flit-core,
filetype,
ipykernel,
python,
pexpect,
Expand All @@ -12,13 +13,13 @@

buildPythonPackage rec {
pname = "bash-kernel";
version = "0.9.3";
version = "0.10.0";
pyproject = true;

src = fetchPypi {
pname = "bash_kernel";
inherit version;
hash = "sha256-n3oDgRyn2csfv/gIIjfPBFC5cYIlL9C4BYeha2XmbVg=";
hash = "sha256-LtWgpBbEGNHXUecVBb1siJ4SFXREtQxCh6aF2ndcKMo=";
};

patches = [
Expand All @@ -28,9 +29,10 @@ buildPythonPackage rec {
})
];

nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];

propagatedBuildInputs = [
dependencies = [
filetype
ipykernel
pexpect
];
Expand Down Expand Up @@ -58,11 +60,11 @@ buildPythonPackage rec {
runHook postCheck
'';

meta = with lib; {
meta = {
description = "Bash Kernel for Jupyter";
homepage = "https://github.com/takluyver/bash_kernel";
changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ zimbatm ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ zimbatm ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jupysql/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@

buildPythonPackage rec {
pname = "jupysql";
version = "0.10.16";
version = "0.10.17";

pyproject = true;

src = fetchFromGitHub {
owner = "ploomber";
repo = "jupysql";
tag = version;
hash = "sha256-TIISiGvspRG0d/4nEyi8Tiu0y80D1Rf8puDEkGIeA08=";
hash = "sha256-0lrcNKDKmM3Peodc9ZzgqkzwPHPLMxxXHAj4OOKWZxA=";
};

pythonRelaxDeps = [ "sqlalchemy" ];
Expand Down
30 changes: 21 additions & 9 deletions pkgs/development/python-modules/jupyter-events/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
pythonOlder,

# build
Expand All @@ -12,6 +13,8 @@
python-json-logger,
pyyaml,
referencing,
rfc3339-validator,
rfc3986-validator,
traitlets,

# optionals
Expand All @@ -26,25 +29,34 @@

buildPythonPackage rec {
pname = "jupyter-events";
version = "0.10.0";
version = "0.11.0";
pyproject = true;

disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "jupyter";
repo = "jupyter_events";
tag = "v${version}";
hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk=";
hash = "sha256-e+BxJc/i5lpljvv6Uwqwrog+nLJ4NOBSqd47Q7DELOE=";
};

nativeBuildInputs = [ hatchling ];
patches = [
# https://github.com/jupyter/jupyter_events/pull/110
(fetchpatch2 {
name = "python-json-logger-compatibility.patch";
url = "https://github.com/jupyter/jupyter_events/commit/6704ea630522f44542d83608f750da0068e41443.patch";
hash = "sha256-PfmOlbXRFdQxhM3SngjjUNsiueuUfCO7xlyLDGSnzj4=";
})
];

build-system = [ hatchling ];

propagatedBuildInputs = [
dependencies = [
jsonschema
python-json-logger
pyyaml
referencing
rfc3339-validator
rfc3986-validator
traitlets
] ++ jsonschema.optional-dependencies.format-nongpl;

Expand All @@ -67,12 +79,12 @@ buildPythonPackage rec {

pythonImportsCheck = [ "jupyter_events" ];

meta = with lib; {
meta = {
changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}";
description = "Configurable event system for Jupyter applications and extensions";
mainProgram = "jupyter-events";
homepage = "https://github.com/jupyter/jupyter_events";
license = licenses.bsd3;
maintainers = [ ];
license = lib.licenses.bsd3;
maintainers = lib.teams.jupyter.members;
};
}
16 changes: 9 additions & 7 deletions pkgs/development/python-modules/jupyter-server/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@

buildPythonPackage rec {
pname = "jupyter-server";
version = "2.14.2";
version = "2.15.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";

src = fetchPypi {
pname = "jupyter_server";
inherit version;
hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs=";
hash = "sha256-nURrhpe09zN6G3zcrEB3i6vdk7phS21oqxwMkY8cQIQ=";
};

nativeBuildInputs = [
build-system = [
hatch-jupyter-builder
hatchling
];

propagatedBuildInputs = [
dependencies = [
argon2-cffi
jinja2
tornado
Expand All @@ -74,6 +74,8 @@ buildPythonPackage rec {
# https://github.com/NixOS/nixpkgs/issues/299427
stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ];

pythonImportsCheck = [ "jupyter_server" ];

nativeCheckInputs = [
ipykernel
pytestCheckHook
Expand Down Expand Up @@ -123,12 +125,12 @@ buildPythonPackage rec {

__darwinAllowLocalNetworking = true;

meta = with lib; {
meta = {
changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md";
description = "Backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications";
mainProgram = "jupyter-server";
homepage = "https://github.com/jupyter-server/jupyter_server";
license = licenses.bsdOriginal;
license = lib.licenses.bsdOriginal;
maintainers = lib.teams.jupyter.members;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

buildPythonPackage rec {
pname = "jupyterhub-ldapauthenticator";
version = "2.0.1";
version = "2.0.2";
pyproject = true;

src = fetchFromGitHub {
owner = "jupyterhub";
repo = "ldapauthenticator";
tag = version;
hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k=";
hash = "sha256-xixgry/++E6RimB8wo1NF8SsfzxKL1ZlNQVrlBhQ674=";
};

build-system = [ setuptools ];
Expand Down
46 changes: 27 additions & 19 deletions pkgs/development/python-modules/jupyterlab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,57 @@
hatchling,
async-lru,
httpx,
packaging,
tornado,
importlib-metadata,
ipykernel,
jinja2,
jupyter-core,
jupyter-lsp,
jupyterlab-server,
jupyter-server,
jupyterlab-server,
notebook-shim,
jinja2,
packaging,
setuptools,
tomli,
tornado,
traitlets,
pythonOlder,
}:

buildPythonPackage rec {
pname = "jupyterlab";
version = "4.2.5";
version = "4.3.4";
pyproject = true;

disabled = pythonOlder "3.8";

src = fetchPypi {
inherit pname version;
hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U=";
hash = "sha256-8LubCaBHZuNCPMzC/CMWmqL/7c34cT6eD7M8rAtoWdA=";
};

build-system = [
hatch-jupyter-builder
hatchling
];

dependencies = [
async-lru
httpx
packaging
tornado
ipykernel
jupyter-core
jupyter-lsp
jupyterlab-server
jupyter-server
notebook-shim
jinja2
] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
dependencies =
[
async-lru
httpx
ipykernel
jinja2
jupyter-core
jupyter-lsp
jupyter-server
jupyterlab-server
notebook-shim
packaging
setuptools
tornado
traitlets
]
++ lib.optionals (pythonOlder "3.11") [ tomli ]
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];

makeWrapperArgs = [
"--set"
Expand Down
28 changes: 14 additions & 14 deletions pkgs/development/python-modules/livelossplot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,47 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
pytestCheckHook,
bokeh,
ipython,
matplotlib,
numpy,
nbconvert,
nbformat,
}:

buildPythonPackage rec {
pname = "livelossplot";
version = "0.5.5";
format = "setuptools";

disabled = pythonOlder "3.6";
version = "0.5.6";
pyproject = true;

src = fetchFromGitHub {
owner = "stared";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs=";
tag = "v${version}";
hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA=";
};

propagatedBuildInputs = [
build-system = [ setuptools ];

dependencies = [
bokeh
ipython
matplotlib
numpy
];

pythonImportsCheck = [ "livelossplot" ];

nativeCheckInputs = [
ipython
nbconvert
nbformat
pytestCheckHook
];

meta = with lib; {
meta = {
description = "Live training loss plot in Jupyter for Keras, PyTorch, and others";
homepage = "https://github.com/stared/livelossplot";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}
Loading

0 comments on commit ca7812d

Please sign in to comment.