From c05faf2d265408a85c0b4d4e93a10309f9b6a429 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Tue, 16 Dec 2025 15:01:06 +0000
Subject: [PATCH] gnu: python-jupyter-console: Move to jupyter.

* gnu/packages/python-xyz.scm (python-jupyter-console): Move from here ...
* gnu/packages/jupyter.scm: ... to here.

Change-Id: I687d44df58fab4d62a3eac92f2dab1eebdc89921
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
---
 gnu/packages/jupyter.scm    | 52 ++++++++++++++++++++++++++++++++++---
 gnu/packages/python-xyz.scm | 42 ------------------------------
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 6d2b5d01b034c09532e3cce73ee6aba1e74f808a..dd512cb55806d165345408cef3f73df13d61f68c 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -1,12 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2024 Danny Milosavljevic <dannym@friendly-machines.com>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
-;;; Copyright © 2016, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016, 2019, 2021-2025 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
-;;; Copyright © 2019, 2021-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2021-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019, 2022 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2019 Edouard Klein <edk@beaver-labs.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@@ -18,6 +19,7 @@
 ;;; Copyright © 2023 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2024 Danny Milosavljevic <dannym@friendly-machines.com>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2024, 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr>
 ;;;
@@ -494,6 +496,48 @@ installing @code{kernelspec}s for use with Jupyter frontends.")
      (native-inputs
       (list python-hatchling)))))
 
+(define-public python-jupyter-console
+  (package
+    (name "python-jupyter-console")
+    (version "6.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jupyter_console" version))
+       (sha256
+        (base32
+         "0f9mllaavanqlimiv9sxxmqrmdb961p89prcyanvzbc73krlnsjn"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; ModuleNotFoundError: No module named 'traitlets'
+      #~(list "--deselect=jupyter_console/tests/test_console.py::test_generate_config")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list python-flaky
+           python-hatchling
+           python-pytest))
+    (propagated-inputs
+     (list python-ipykernel
+           python-ipython
+           python-jupyter-client
+           python-jupyter-core
+           python-prompt-toolkit
+           python-pygments
+           python-pyzmq
+           python-traitlets))
+    (home-page "https://jupyter.org")
+    (synopsis "Jupyter terminal console")
+    (description "This package provides a terminal-based console frontend for
+Jupyter kernels.  It also allows for console-based interaction with non-Python
+Jupyter kernels such as IJulia and IRKernel.")
+    (license license:bsd-3)))
+
 (define-public python-jupyter-core
   (package
     (name "python-jupyter-core")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 58e8e569dc10035040872bd5c8f218580e78a2c6..0c18dbb1de197898641610f227c58ad43c43b05f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18700,48 +18700,6 @@ widgets are used.  Users gain control of their data and can visualize changes
 in the data.")
     (license license:bsd-3)))
 
-(define-public python-jupyter-console
-  (package
-    (name "python-jupyter-console")
-    (version "6.6.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "jupyter_console" version))
-       (sha256
-        (base32
-         "0f9mllaavanqlimiv9sxxmqrmdb961p89prcyanvzbc73krlnsjn"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; ModuleNotFoundError: No module named 'traitlets'
-      #~(list "--deselect=jupyter_console/tests/test_console.py::test_generate_config")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'pre-check
-            (lambda _
-              (setenv "HOME" "/tmp"))))))
-    (native-inputs
-     (list python-flaky
-           python-hatchling
-           python-pytest))
-    (propagated-inputs
-     (list python-ipykernel
-           python-ipython
-           python-jupyter-client
-           python-jupyter-core
-           python-prompt-toolkit
-           python-pygments
-           python-pyzmq
-           python-traitlets))
-    (home-page "https://jupyter.org")
-    (synopsis "Jupyter terminal console")
-    (description "This package provides a terminal-based console frontend for
-Jupyter kernels.  It also allows for console-based interaction with non-Python
-Jupyter kernels such as IJulia and IRKernel.")
-    (license license:bsd-3)))
-
 (define-public python-jsbeautifier
   (package
     (name "python-jsbeautifier")