From 4b302dbc95363e81c03d0c242602744b879f78bc Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:15:05 +0900 Subject: [PATCH 1/6] python311Packages.jupyter-core: 5.5.1 -> 5.7.0 Diff: https://github.com/jupyter/jupyter_core/compare/refs/tags/v5.5.1...v5.7.0 Changelog: https://github.com/jupyter/jupyter_core/blob/refs/tags/v5.7.0/CHANGELOG.md --- pkgs/development/python-modules/jupyter-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 1ab9f5770909..68f66994d180 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.5.1"; + version = "5.7.0"; disabled = pythonOlder "3.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-X8yBh63JYIuIatLtJU0pOD8Oz/QpJShU0R2VGAgPAa4="; + hash = "sha256-y3a2pSk+6QNSVg0skosbf6uHSXpvMubyflP6jQleI44="; }; patches = [ From 5227353617e8626f3295a8b31949226382c4b08c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:15:45 +0900 Subject: [PATCH 2/6] python311Packages.jupyter-server: 2.12.1 -> 2.12.2 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.12.2/CHANGELOG.md --- pkgs/development/python-modules/jupyter-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 47d5b0c33220..f938497d3412 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.12.1"; - format = "pyproject"; + version = "2.12.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-3He33MX8BUesuisoRPAXmACGZyAe6ifGMZ/5JX1wCm0="; + hash = "sha256-Xq6GvhUiS1N1zewMNULOcv8g96JSl6KoFmolC7RVpRk="; }; nativeBuildInputs = [ From 9cd747bff44309b8f8ad88656dc8bf7c15b5b595 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:16:05 +0900 Subject: [PATCH 3/6] python311Packages.jupyter-sphinx: 0.4.0 -> 0.5.3 Changelog: https://github.com/jupyter/jupyter-sphinx/releases/tag/v0.5.3 --- .../python-modules/jupyter-sphinx/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 3c41db14e7a7..87f6bf3d4bbf 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -1,30 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, nbformat -, sphinx +, hatchling +, ipykernel +, ipython , ipywidgets -, pythonOlder , nbconvert +, nbformat +, pythonOlder +, sphinx }: buildPythonPackage rec { pname = "jupyter-sphinx"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "jupyter_sphinx"; - hash = "sha256-DBGjjxNDE48sUFHA00xMVF9EgBdMG9QcAlb+gm4LqlU="; + hash = "sha256-LiNpmjoc9dsxsQmB2lqjJgbucw9rc6hE0edtgAdWr1Y="; }; - propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + ipykernel + ipython + ipywidgets + nbconvert + nbformat + sphinx + ]; doCheck = false; - disabled = pythonOlder "3.5"; - meta = with lib; { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; From 123996d4409bc0fa250bacae310f35155f10a1f4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 11:01:24 +0900 Subject: [PATCH 4/6] python311Packages.jupyter-sphinx: enable tests --- .../python-modules/jupyter-sphinx/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 87f6bf3d4bbf..9fb30b5e143e 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , hatchling , ipykernel , ipython @@ -9,6 +9,7 @@ , nbformat , pythonOlder , sphinx +, pytestCheckHook }: buildPythonPackage rec { @@ -18,10 +19,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version; - pname = "jupyter_sphinx"; - hash = "sha256-LiNpmjoc9dsxsQmB2lqjJgbucw9rc6hE0edtgAdWr1Y="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter-sphinx"; + rev = "refs/tags/v${version}"; + hash = "sha256-o/i3WravKZPf7uw2H4SVYfAyaZGf19ZJlkmeHCWcGtE="; }; nativeBuildInputs = [ @@ -37,12 +39,26 @@ buildPythonPackage rec { sphinx ]; - doCheck = false; + pythonImportsCheck = [ + "jupyter_sphinx" + ]; + + env.JUPYTER_PLATFORM_DIRS = 1; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; + changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/${src.rev}"; license = licenses.bsd3; }; - } From d0a3bd40f7ea820832c1727f2a6c79199031e76c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:16:42 +0900 Subject: [PATCH 5/6] python311Packages.jupyterlab: 4.0.9 -> 4.0.10 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.0.10/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ae4437216fdc..c00e171772e1 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.9"; + version = "4.0.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-nrraQdUmUfYjwMnwad24oh1oSOTIh9jl3cBhMWbtXAs="; + hash = "sha256-Rhd+uO3nDcc76SKsmfjvlDvcLfvGoxs1PEvehIo13uE="; }; nativeBuildInputs = [ From 93fe029ac5c9a11e0946feaadb66a45e1c129ae4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:17:44 +0900 Subject: [PATCH 6/6] python311Packages.nbconvert: 7.13.1 -> 7.14.0 Changelog: https://github.com/jupyter/nbconvert/blob/v7.14.0/CHANGELOG.md --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 795ffa0b8d73..922b7259bf05 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -32,14 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.13.1"; + version = "7.14.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Lcgmfb3+7c4tzTTJ4/G1GvGPQ8sQVUnRxaGBiewjuoU="; + hash = "sha256-krmkS2Plp/tPb6DvQSYeNcFpJQRszRwEpcgJm/EAR24="; }; # Add $out/share/jupyter to the list of paths that are used to search for