From ea3e3d0d4be7da7283c812f8e5ed65cf648e9947 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:48:20 +0100
Subject: [PATCH] python3Packages.jupyter-server: Rename from jupyter_server

---
 pkgs/development/python-modules/jupyter-lsp/default.nix      | 4 ++--
 .../python-modules/jupyter-server-mathjax/default.nix        | 4 ++--
 .../{jupyter_server => jupyter-server}/default.nix           | 5 +++--
 pkgs/development/python-modules/jupyterlab-git/default.nix   | 4 ++--
 .../development/python-modules/jupyterlab_server/default.nix | 4 ++--
 pkgs/development/python-modules/nbclassic/default.nix        | 4 ++--
 pkgs/development/python-modules/notebook-shim/default.nix    | 4 ++--
 pkgs/development/python-modules/pytest-jupyter/default.nix   | 4 ++--
 pkgs/top-level/python-aliases.nix                            | 1 +
 pkgs/top-level/python-packages.nix                           | 2 +-
 10 files changed, 19 insertions(+), 17 deletions(-)
 rename pkgs/development/python-modules/{jupyter_server => jupyter-server}/default.nix (96%)

diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix
index ffcde4a5b21..342e0233eb7 100644
--- a/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyter-lsp/default.nix
@@ -2,7 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchPypi
-, jupyter_server
+, jupyter-server
 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
   ];
   # tests require network
   doCheck = false;
diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
index 73797f8fd0d..b6201769f86 100644
--- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , jupyter-packaging
-, jupyter_server
+, jupyter-server
 , pytest-tornasync
 , pytestCheckHook
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
similarity index 96%
rename from pkgs/development/python-modules/jupyter_server/default.nix
rename to pkgs/development/python-modules/jupyter-server/default.nix
index 7d948f7b52f..5af8bbe7e24 100644
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -34,13 +34,14 @@
 }:
 
 buildPythonPackage rec {
-  pname = "jupyter_server";
+  pname = "jupyter-server";
   version = "2.0.6";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "jupyter_server";
+    inherit version;
     hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8=";
   };
 
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 666de2d8939..6fac2db61bd 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , git
-, jupyter_server
+, jupyter-server
 , jupyter-packaging
 , jupyterlab
 , nbdime
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
     nbdime
     git
     nbformat
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index b891d9e0e7e..1aeeef15728 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -8,7 +8,7 @@
 , pytestCheckHook
 , json5
 , babel
-, jupyter_server
+, jupyter-server
 , tomli
 , openapi-core
 , pytest-timeout
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     jsonschema
     json5
     babel
-    jupyter_server
+    jupyter-server
     tomli
   ] ++ lib.optionals (pythonOlder "3.10") [
     importlib-metadata
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 294898fc4a6..b2554c3f473 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -7,7 +7,7 @@
 , jinja2
 , jupyter-client
 , jupyter-core
-, jupyter_server
+, jupyter-server
 , nbconvert
 , nbformat
 , nest-asyncio
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     jinja2
     jupyter-client
     jupyter-core
-    jupyter_server
+    jupyter-server
     nbconvert
     nbformat
     nest-asyncio
diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index 4f606a41570..2ca5d0e44fa 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, jupyter_server
+, jupyter-server
 , pytestCheckHook
 , pytest-tornasync
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s=";
   };
 
-  propagatedBuildInputs = [ jupyter_server ];
+  propagatedBuildInputs = [ jupyter-server ];
 
   preCheck = ''
     mv notebook_shim/conftest.py notebook_shim/tests
diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
index 39a9e7500e6..def50bf46d6 100644
--- a/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -12,7 +12,7 @@
 # optionals
 , jupyter-client
 , ipykernel
-, jupyter_server
+, jupyter-server
 , nbformat
 
 # tests
@@ -50,7 +50,7 @@ let self = buildPythonPackage rec {
       ipykernel
     ];
     server = [
-      jupyter_server
+      jupyter-server
       nbformat
     ] ++ client;
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d69cabc379e..ed7a8427484 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -108,6 +108,7 @@ mapAliases ({
   jinja2_time = jinja2-time; # added 2022-11-07
   jupyter_client = jupyter-client; # added 2021-10-15
   jupyter_core = jupyter-core; # added 2023-01-05
+  jupyter_server = jupyter-server; # 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 26a7b67e2ed..30ab7f4a058 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4940,7 +4940,7 @@ self: super: with self; {
 
   jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { };
 
-  jupyter_server = callPackage ../development/python-modules/jupyter_server { };
+  jupyter-server = callPackage ../development/python-modules/jupyter-server { };
 
   jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };