From 7fc9919dde93553f4090761a4e648d31cc469c5e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 18 Oct 2025 10:50:46 +0100 Subject: [PATCH] gnu: python-nbdime: Update to 4.0.2. * gnu/packages/jupyter.scm (python-nbdime): Update to 4.0.2. [buld-system]: Switch to pyproject-build-system. [arguments] : Remove 'remove-ipython-genutils; add 'pre-check. [native-inputs]: Remove python-jupyter-server, python-notebook, and python-tabulate; add git-minimal/pinned, python-hatch-jupyter-builder, and python-hatchling. Change-Id: I6ccf935093b07c6aa2646d0cb9b0d58b0b2991b9 --- gnu/packages/jupyter.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 54288238b41bb59c9ab3d268a521dadabf42c4d4..efeea491a0b1633fffb94fddb19107d813429391 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -1025,26 +1025,28 @@ It was formerly known as nbconvert's @code{ExecutePreprocessor.}") (define-public python-nbdime (package (name "python-nbdime") - (version "3.1.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "nbdime" version)) (sha256 - (base32 "12v41lricbg713lzlfcx0cilfm9spndaanhp39q4ydvix4h76xk7")))) - (build-system python-build-system) + (base32 "1whvdz9i3c2f4fgy1mnvv0z88rxv6540rmi07cjhnv139f7ry9yq")))) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-ipython-genutils - ;; TODO: Remove when a release newer than 3.1.1 is made. + (add-before 'check 'pre-check (lambda _ - (substitute* "nbdime/config.py" - (("from ipython_genutils import py3compat") - "") - (("py3compat\\.getcwd") - "os.getcwd"))))))) + (setenv "HOME" "/tmp") + (setenv "GIT_AUTHOR_NAME" "Your Name") + (setenv "GIT_COMMITTER_NAME" "Your Name") + (setenv "GIT_AUTHOR_EMAIL" "you@example.com") + (setenv "GIT_COMMITTER_EMAIL" "you@example.com") + (invoke "git" "init") + (invoke "git" "config" "--global" "user.name" "Your Name") + (invoke "git" "config" "--global" "user.email" "you@example.com")))))) (propagated-inputs (list python-colorama python-gitpython @@ -1056,12 +1058,12 @@ It was formerly known as nbconvert's @code{ExecutePreprocessor.}") python-requests python-tornado-6)) (native-inputs - (list python-jupyter-server + (list git-minimal/pinned + python-hatch-jupyter-builder + python-hatchling python-mock - python-notebook python-pytest - python-pytest-tornado - python-tabulate)) + python-pytest-tornado)) (home-page "https://nbdime.readthedocs.io") (synopsis "Diff tools for Jupyter Notebooks") (description "@code{nbdime} provides tools for diffing and merging of