From eb85576db1c7dcb9753f50eb03a947da08516dbc Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 31 Jul 2023 22:43:30 +0900 Subject: [PATCH 1/3] python310Packages.jupyter-console: rename from jupyter_console --- pkgs/development/python-modules/ilua/default.nix | 4 ++-- .../{jupyter_console => jupyter-console}/default.nix | 5 +++-- pkgs/development/python-modules/jupyter/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{jupyter_console => jupyter-console}/default.nix (94%) diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix index 143f1ed035f9..9c6a7f6cb337 100644 --- a/pkgs/development/python-modules/ilua/default.nix +++ b/pkgs/development/python-modules/ilua/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, jupyter_console +, jupyter-console , jupyter-core , pygments , termcolor @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_console + jupyter-console jupyter-core pygments termcolor diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix similarity index 94% rename from pkgs/development/python-modules/jupyter_console/default.nix rename to pkgs/development/python-modules/jupyter-console/default.nix index 91e21f91019e..2857e32f68db 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -18,14 +18,15 @@ }: buildPythonPackage rec { - pname = "jupyter_console"; + pname = "jupyter-console"; version = "6.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "jupyter_console"; + inherit version; hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw="; }; diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index 818623c2513b..b795dc9c9101 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -3,7 +3,7 @@ , fetchPypi , notebook , qtconsole -, jupyter_console +, jupyter-console , nbconvert , ipykernel , ipywidgets @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; }; - propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; + propagatedBuildInputs = [ notebook qtconsole jupyter-console nbconvert ipykernel ipywidgets ]; # Meta-package, no tests doCheck = false; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 89ad05c16de0..74a20905a574 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -193,6 +193,7 @@ mapAliases ({ JPype1 = jpype1; # added 2023-02-19 jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 + jupyter_console = jupyter-console; # added 2023-07-31 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c34eb74a62f..db3570dd9f61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5603,7 +5603,7 @@ self: super: with self; { jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; - jupyter_console = callPackage ../development/python-modules/jupyter_console { }; + jupyter-console = callPackage ../development/python-modules/jupyter-console { }; jupyter-core = callPackage ../development/python-modules/jupyter-core { }; From a960eac815df737abecd83054e9ef1939bda0959 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 31 Jul 2023 22:56:53 +0900 Subject: [PATCH 2/3] python310Packages.jupyter-console: add jupyter team as maintainers --- pkgs/development/python-modules/jupyter-console/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index 2857e32f68db..34df4c66d60a 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -72,5 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_console"; changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}"; license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } From 8012e0d22686f9a305f46f73dc04b71218a27e14 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 31 Jul 2023 23:06:09 +0900 Subject: [PATCH 3/3] python310Packages.jupyter-console: 6.6.1 -> 6.6.3 Changelog: https://github.com/jupyter/jupyter_console/releases/tag/v6.6.3 --- pkgs/development/python-modules/jupyter-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index 34df4c66d60a..e847c341f4d8 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-console"; - version = "6.6.1"; + version = "6.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_console"; inherit version; - hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw="; + hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; }; nativeBuildInputs = [