sharlatan pushed a commit to branch master
in repository guix.
commit 0e52d86de1471dc631cb5d1be89597d84555b568
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Thu May 8 11:44:15 2025 +0100
gnu: jupyter: Move to jupyter.
* gnu/packages/python-xyz.scm (jupyter): Move from here ...
* gnu/packages/jupyter.scm: ... to here.
* gnu/packages/package-management.scm: Add jupyter module.
* gnu/packages/cran.scm: Likewise.
Change-Id: I357b4e96462e3ef6815bdcafd151bd56f298f8ac
---
gnu/packages/cran.scm | 2 ++
gnu/packages/jupyter.scm | 37 +++++++++++++++++++++++++++++++++++++
gnu/packages/package-management.scm | 2 ++
gnu/packages/python-xyz.scm | 36 ------------------------------------
4 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a036b0cd93..9b0fbf8f9f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -91,6 +91,7 @@
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages java)
#:use-module (gnu packages javascript)
+ #:use-module (gnu packages jupyter)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages machine-learning)
@@ -33578,6 +33579,7 @@ Jupyter front-ends (e.g. Jupyter Notebook). It is
designed to be used from a
running IRkernel session.")
(license license:expat)))
+;; XXX: Maybe move to jupyter module.
(define-public r-irkernel
(package
(name "r-irkernel")
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index ada5afaeec..25f485cf73 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2019, 2021-2025 Ricardo Wurmus <rek...@elephly.net>
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.ro...@inria.fr>
;;; Copyright © 2019, 2021, 2022 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2019, 2022 Andreas Enge <andr...@enge.fr>
;;; Copyright © 2021 Hugo Lecomte <hugo.leco...@inria.fr>
@@ -61,6 +62,42 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages xorg))
+(define-public jupyter
+ (package
+ (name "jupyter")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "jupyter" version))
+ (sha256
+ (base32
+ "0pwf3pminkzyzgx5kcplvvbvwrrzd3baa7lmh96f647k30rlpp6r"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:tests? #f ;there are none.
+ #:phases
+ ;; Because python-jsonschema has an old python-webcolor. Remove this
+ ;; when python-team branch is merged.
+ '(modify-phases %standard-phases
+ (delete 'sanity-check))))
+ (propagated-inputs
+ (list python-ipykernel
+ python-ipywidgets
+ python-jupyter-console
+ python-nbconvert
+ python-notebook
+ python-qtconsole))
+ (home-page "https://jupyter.org";)
+ (synopsis "Web application for interactive documents")
+ (description
+ "The Jupyter Notebook is a web application that allows you to create and
+share documents that contain live code, equations, visualizations and
+explanatory text. Uses include: data cleaning and transformation, numerical
+simulation, statistical modeling, machine learning and much more.")
+ (license license:bsd-3)))
+
(define-public python-nbclassic
(package
(name "python-nbclassic")
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index bc3d45038f..23ecc753cd 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -85,6 +85,7 @@
#:use-module (gnu packages hardware)
#:use-module (gnu packages hurd)
#:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages jupyter)
#:use-module (gnu packages less)
#:use-module (gnu packages libedit)
#:use-module (gnu packages linux)
@@ -1772,6 +1773,7 @@ outputs of those builds.
This package just includes the agent component.")))
+;; XXX: Maybe move to jupyter module.
(define-public guix-jupyter
(package
(name "guix-jupyter")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a2aa6fb7b5..5d898b484b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19462,42 +19462,6 @@ Jupyter kernels such as IJulia and IRKernel.")
popular online obfuscators.")
(license license:expat)))
-(define-public jupyter
- (package
- (name "jupyter")
- (version "1.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "jupyter" version))
- (sha256
- (base32
- "0pwf3pminkzyzgx5kcplvvbvwrrzd3baa7lmh96f647k30rlpp6r"))))
- (build-system python-build-system)
- (arguments
- (list
- #:tests? #f ;there are none.
- #:phases
- ;; Because python-jsonschema has an old python-webcolor. Remove this
- ;; when python-team branch is merged.
- '(modify-phases %standard-phases
- (delete 'sanity-check))))
- (propagated-inputs
- (list python-ipykernel
- python-ipywidgets
- python-jupyter-console
- python-nbconvert
- python-notebook
- python-qtconsole))
- (home-page "https://jupyter.org";)
- (synopsis "Web application for interactive documents")
- (description
- "The Jupyter Notebook is a web application that allows you to create and
-share documents that contain live code, equations, visualizations and
-explanatory text. Uses include: data cleaning and transformation, numerical
-simulation, statistical modeling, machine learning and much more.")
- (license license:bsd-3)))
-
(define-public python-chardet
(package
(name "python-chardet")
