From 6bf557fc682235614949ca833205d5b4de7774d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:25:47 +0100
Subject: [PATCH] python3Packages.jupyter-core: rename from jupyter_core

---
 pkgs/applications/editors/jupyter-kernels/octave/default.nix  | 2 +-
 pkgs/applications/science/math/sage/sagelib.nix               | 4 ++--
 pkgs/development/python-modules/ilua/default.nix              | 4 ++--
 pkgs/development/python-modules/jupyter-client/default.nix    | 4 ++--
 .../python-modules/{jupyter_core => jupyter-core}/default.nix | 2 +-
 .../tests_respect_pythonpath.patch                            | 0
 pkgs/development/python-modules/metakernel/default.nix        | 4 ++--
 pkgs/development/python-modules/nbclassic/default.nix         | 4 ++--
 pkgs/development/python-modules/nbconvert/default.nix         | 4 ++--
 pkgs/development/python-modules/nbformat/default.nix          | 4 ++--
 pkgs/development/python-modules/notebook/default.nix          | 4 ++--
 pkgs/development/python-modules/qtconsole/default.nix         | 4 ++--
 pkgs/development/python-modules/vega/default.nix              | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 2 +-
 15 files changed, 24 insertions(+), 23 deletions(-)
 rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/default.nix (97%)
 rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/tests_respect_pythonpath.patch (100%)

diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index c5265aa255c2..cb814ddbc95a 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -20,7 +20,7 @@ in
 rec {
   launcher = runCommand "octave-kernel-launcher" {
     inherit octave;
-    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
+    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]);
     nativeBuildInputs = [ makeWrapper ];
   } ''
     mkdir -p $out/bin
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 8f864d136928..143e5a2a22b3 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -49,7 +49,7 @@
 , boost
 , singular
 , pip
-, jupyter_core
+, jupyter-core
 , sage-setup
 , libhomfly
 , libbraiding
@@ -87,7 +87,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    jupyter_core
+    jupyter-core
     pkg-config
     sage-setup
     pip # needed to query installed packages
diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix
index 5b5c129c2749..28bc7524fa9e 100644
--- a/pkgs/development/python-modules/ilua/default.nix
+++ b/pkgs/development/python-modules/ilua/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , jupyter_console
-, jupyter_core
+, jupyter-core
 , pygments
 , termcolor
 , txzmq
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jupyter_console
-    jupyter_core
+    jupyter-core
     pygments
     termcolor
     txzmq
diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 11c41677b5ac..23a1f35d2de8 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , entrypoints
-, jupyter_core
+, jupyter-core
 , hatchling
 , nest-asyncio
 , python-dateutil
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     entrypoints
-    jupyter_core
+    jupyter-core
     nest-asyncio
     python-dateutil
     pyzmq
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix
similarity index 97%
rename from pkgs/development/python-modules/jupyter_core/default.nix
rename to pkgs/development/python-modules/jupyter-core/default.nix
index 1e540ff6a584..761db23a5ef8 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter-core/default.nix
@@ -9,7 +9,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "jupyter_core";
+  pname = "jupyter-core";
   version = "5.1.1";
   disabled = pythonOlder "3.7";
 
diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch
similarity index 100%
rename from pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
rename to pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch
diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix
index b7cecc3ba3da..748de6f67541 100644
--- a/pkgs/development/python-modules/metakernel/default.nix
+++ b/pkgs/development/python-modules/metakernel/default.nix
@@ -4,7 +4,7 @@
 , hatchling
 , ipykernel
 , jedi
-, jupyter_core
+, jupyter-core
 , pexpect
 , pythonOlder
 }:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     ipykernel
     jedi
-    jupyter_core
+    jupyter-core
     pexpect
   ];
 
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 7065191b1ad1..294898fc4a62 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -6,7 +6,7 @@
 , ipython_genutils
 , jinja2
 , jupyter-client
-, jupyter_core
+, jupyter-core
 , jupyter_server
 , nbconvert
 , nbformat
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     ipython_genutils
     jinja2
     jupyter-client
-    jupyter_core
+    jupyter-core
     jupyter_server
     nbconvert
     nbformat
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 7f994b4682d8..79386e02740b 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -9,7 +9,7 @@
 , importlib-metadata
 , ipywidgets
 , jinja2
-, jupyter_core
+, jupyter-core
 , jupyterlab-pygments
 , lib
 , markupsafe
@@ -66,7 +66,7 @@ in buildPythonPackage rec {
     bleach
     defusedxml
     jinja2
-    jupyter_core
+    jupyter-core
     jupyterlab-pygments
     markupsafe
     mistune
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index c9c66ca33a64..a9dae6b06348 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -6,7 +6,7 @@
 , hatch-nodejs-version
 , fastjsonschema
 , jsonschema
-, jupyter_core
+, jupyter-core
 , traitlets
 , pep440
 , pytestCheckHook
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     fastjsonschema
     jsonschema
-    jupyter_core
+    jupyter-core
     traitlets
   ];
 
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 4e16aa3bdd0f..33e2886606f8 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -12,7 +12,7 @@
 , tornado
 , ipython_genutils
 , traitlets
-, jupyter_core
+, jupyter-core
 , jupyter-client
 , nbformat
 , nbconvert
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
 
   propagatedBuildInputs = [
-    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
+    jinja2 tornado ipython_genutils traitlets jupyter-core send2trash
     jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
     prometheus-client argon2-cffi
   ];
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 5c618b418931..6eb47d0fd5f1 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ipykernel
-, jupyter_core
+, jupyter-core
 , jupyter-client
 , pygments
 , pyqt5
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     ipykernel
-    jupyter_core
+    jupyter-core
     jupyter-client
     pygments
     pyqt5
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 9bc875963163..989a26c11d98 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage , fetchPypi, pythonOlder
-, jupyter_core, pandas, ipywidgets, jupyter }:
+, jupyter-core, pandas, ipywidgets, jupyter }:
 
 buildPythonPackage rec {
   pname = "vega";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80=";
   };
 
-  propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ];
+  propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ];
 
   # currently, recommonmark is broken on python3
   doCheck = false;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 697b6bca59bc..d69cabc379ea 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -107,6 +107,7 @@ mapAliases ({
   itanium_demangler = itanium-demangler; # added 2022-1017
   jinja2_time = jinja2-time; # added 2022-11-07
   jupyter_client = jupyter-client; # added 2021-10-15
+  jupyter_core = jupyter-core; # added 2023-01-05
   Keras = keras; # added 2021-11-25
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb4fe047eddd..f4f81c61ca9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4934,7 +4934,7 @@ self: super: with self; {
 
   jupyter_console = callPackage ../development/python-modules/jupyter_console { };
 
-  jupyter_core = callPackage ../development/python-modules/jupyter_core { };
+  jupyter-core = callPackage ../development/python-modules/jupyter-core { };
 
   jupyter-events = callPackage ../development/python-modules/jupyter-events { };