From 343d91526a23fee3ba9079c743174a0b2eca8add Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:51:45 +0900 Subject: [PATCH 01/15] python311Packages.ipywidgets: 8.1.2 -> 8.1.3 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 493e32789a49..8c985163653b 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.1.2"; + version = "8.1.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0Lm0Hkm66SaoZuYTo5sPAJd0XSufHz3UBmQbSlfsQsk="; + hash = "sha256-9fnuquCCsYI86erCV1JylS9A10iJOXKVbcCXAKY5LZw="; }; nativeBuildInputs = [ From 0115271a28e296c9cd4068494bff1c55efd806f6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:52:02 +0900 Subject: [PATCH 02/15] python311Packages.jupyter-server: 2.14.0 -> 2.14.1 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.14.1/CHANGELOG.md --- pkgs/development/python-modules/jupyter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index f13ff454e2c4..c8e46158d6e3 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.14.0"; + version = "2.14.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ZZFUzqUSCDQ0/XyTt/4Il696L9C53UdJKCtC6qxK5nc="; + hash = "sha256-ElWNFY7HoGU7+WzCcrx6154BJ9UDuYLtFEOZNGaU9yY="; }; nativeBuildInputs = [ From c141cf5bc9240e953bfe73bd7c40e26b5f71619a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:52:22 +0900 Subject: [PATCH 03/15] python311Packages.jupyterlab-widgets: 3.0.10 -> 3.0.11 --- .../development/python-modules/jupyterlab-widgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 573d42bf44dc..ea09f1c45065 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.10"; + version = "3.0.11"; pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-BPKsBJdnJ+T50PqRzcLxq4YPll5QTCnb1qZciCydBMA="; + hash = "sha256-3VrGeVk8lprynJvtBUwk8mhCuqUTUhFHNnVrwDXe7ic="; }; # jupyterlab is required to build from source but we use the pre-build package From 67bf4e83325a16a73ac07f304b063ad4d89ee4fb Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:52:29 +0900 Subject: [PATCH 04/15] python311Packages.marimo: 0.6.14 -> 0.6.17 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.6.17 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 951646d27cd9..1a4a944fd461 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.14"; + version = "0.6.17"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9rbRoBshVK0P8eqdOHyKQCwNkPsp2HiIhzyST3QXJpc="; + hash = "sha256-vK4pa7CnVQp78DhEFIkNLNS5y35x9YV2nV3d0JOBTIA="; }; build-system = [ setuptools ]; From 164f03d97108aec32ffd1988f636351f61239e5c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:52:35 +0900 Subject: [PATCH 05/15] python311Packages.mediapy: 1.2.1 -> 1.2.2 Changelog: https://github.com/google/mediapy/releases/tag/v1.2.2 --- pkgs/development/python-modules/mediapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 190685726135..971fc02dda00 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jINA5J69gPywaVGcOOIrgVwlss4nF4I6qk2W34blxK4="; + hash = "sha256-QtmhqpPBg1ULgk27Tw3l2mGqXITbjwHwY6zR8juQ7wo="; }; nativeBuildInputs = [ flit-core ]; From ce313f16f1cb1e0a3f382fe838ed60a24870ce26 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:52:49 +0900 Subject: [PATCH 06/15] python311Packages.nbdev: 2.3.23 -> 2.3.25 Changelog: https://github.com/fastai/nbdev/blob/2.3.25/CHANGELOG.md --- pkgs/development/python-modules/nbdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index cd97c4b5380e..e46087b9e524 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.23"; + version = "2.3.25"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+HbGHyJ2TX6qnBBPNivFVklrf+Ma2QM3u/2a67NxfIs="; + hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; From 701429c7e9445d2ee7c635de4fafbcbdf4b1d8a8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:53:02 +0900 Subject: [PATCH 07/15] python311Packages.notebook: 7.2.0 -> 7.2.1 Changelog: https://github.com/jupyter/notebook/blob/v7.2.1/CHANGELOG.md --- pkgs/development/python-modules/notebook/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 6b18e5133301..8d9095bc3c11 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.2.0"; - disabled = pythonOlder "3.8"; + version = "7.2.1"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NKK6SwitXRnskw23SE+3l0aheEvp4aX4IY+a+GVqFB8="; + hash = "sha256-Qoe22ll0CzIXPQHWQfdj0pL0nDDnpRuJxGuoRzEmNB4="; }; postPatch = '' @@ -32,13 +32,13 @@ buildPythonPackage rec { --replace "timeout = 300" "" ''; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ jupyter-server jupyterlab jupyterlab-server From beae7d2b520138591c8f654d4460b263a9115ae5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 19:53:18 +0900 Subject: [PATCH 08/15] python311Packages.widgetsnbextension: 4.0.10 -> 4.0.11 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index bd82e62a5e32..c0a6665a41ce 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.10"; + version = "4.0.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZBlsX/O5qRg6jmmaQif7C3AC8lLIFAmOZsTRzQZEaI8="; + hash = "sha256-iyKo8ZEL/RiOWW/n/AXcvYfoEMikugEL2z2oZjc5hHQ="; }; nativeBuildInputs = [ jupyter-packaging ]; From 225752be5cb9fb7353ca6d36d3584200fa3f0d4e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 21:48:39 +0900 Subject: [PATCH 09/15] python311Packages.einops: set __darwinAllowLocalNetworking --- pkgs/development/python-modules/einops/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index e212894380ca..4a6dfc6ab777 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -55,6 +55,8 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_layers.py" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Flexible and powerful tensor operations for readable and reliable code"; homepage = "https://github.com/arogozhnikov/einops"; From 2561c1684d6546e05404cd76ab25b29b01593542 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 21:51:15 +0900 Subject: [PATCH 10/15] python311Packages.mkdocs-jupyter: set __darwinAllowLocalNetworking --- pkgs/development/python-modules/mkdocs-jupyter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index af9153f32181..9573329d6b59 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs_jupyter" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Use Jupyter Notebook in mkdocs"; homepage = "https://github.com/danielfrg/mkdocs-jupyter"; From 9345da9eddde3703c4e836347e5527de15df7325 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 21:52:56 +0900 Subject: [PATCH 11/15] python311Packages.nbexec: set __darwinAllowLocalNetworking --- pkgs/development/python-modules/nbexec/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nbexec/default.nix b/pkgs/development/python-modules/nbexec/default.nix index 05964e464144..961d7046e24a 100644 --- a/pkgs/development/python-modules/nbexec/default.nix +++ b/pkgs/development/python-modules/nbexec/default.nix @@ -52,6 +52,8 @@ buildPythonPackage { pythonImportsCheck = [ "nbexec" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A dead-simple tool for executing Jupyter notebooks from the command line."; mainProgram = "nbexec"; From d76e403082c1303bbc272667016bfea38c378210 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 21:55:17 +0900 Subject: [PATCH 12/15] python311Packages.nbexec: adopt pypa build --- pkgs/development/python-modules/nbexec/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbexec/default.nix b/pkgs/development/python-modules/nbexec/default.nix index 961d7046e24a..b6907a687ced 100644 --- a/pkgs/development/python-modules/nbexec/default.nix +++ b/pkgs/development/python-modules/nbexec/default.nix @@ -7,6 +7,7 @@ jupyter-client, nbformat, nbconvert, + setuptools, # check inputs unittestCheckHook, ipykernel, @@ -17,7 +18,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +29,9 @@ buildPythonPackage { hash = "sha256-Vv6EHX6WlnSmzQAYlO1mHnz5t078z3RQfVfte1+X2pw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jupyter-client nbformat nbconvert From 448a35014e8a135271da938adf82e215cee3e689 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 22:02:13 +0900 Subject: [PATCH 13/15] python311Packages.pytest-notebook: set __darwinAllowLocalNetworking --- pkgs/development/python-modules/pytest-notebook/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 52ce73e01526..f65d7efd9ea2 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -75,6 +75,8 @@ buildPythonPackage rec { "test_run_pass_with_meta" ]; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/chrisjsewell/pytest-notebook/blob/${src.rev}/docs/source/changelog.md"; description = "Pytest plugin for regression testing and regenerating Jupyter Notebooks"; From a3930f1096e2b307e0c7678993bdf0b87fca2c74 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 22:03:54 +0900 Subject: [PATCH 14/15] python311Packages.wasabi: set __darwinAllowLocalNetworking --- pkgs/development/python-modules/wasabi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 5641063a9109..3c916ad7aec1 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "wasabi" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A lightweight console printing and formatting toolkit"; homepage = "https://github.com/ines/wasabi"; From 9d183b919c3549a82ba9c4b24724172eb584427e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 8 Jun 2024 22:08:28 +0900 Subject: [PATCH 15/15] python311Packages.oauthenticator: add missing inputs --- .../python-modules/oauthenticator/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 267a9a7c4ab6..b8caf2c9bcfe 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -5,13 +5,18 @@ fetchPypi, google-api-python-client, google-auth-oauthlib, + jsonschema, jupyterhub, mwoauth, pyjwt, pytest-asyncio, pytestCheckHook, + requests, requests-mock, + ruamel-yaml, setuptools, + tornado, + traitlets, }: buildPythonPackage rec { @@ -34,8 +39,13 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + jsonschema jupyterhub pyjwt + requests + ruamel-yaml + tornado + traitlets ]; passthru.optional-dependencies = {