gnu: repo2docker: Update to 2021.08.0.

* gnu/packages/jupyter.scm (repo2docker): Update to 2021.08.0.
[arguments]: Disable Sphinx warnings, set PYTHONPATH, and refer to
THIS-PACKAGE instead of the "name" variable directly.
[native-inputs]: Add PYTHON-ENTRYPOINTS.
This commit is contained in:
Marius Bakke 2022-01-12 00:59:55 +01:00
parent fb6de84a6b
commit c157ed08c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -2,6 +2,7 @@
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -370,16 +371,16 @@ (define-public python-nbclient
(define-public repo2docker (define-public repo2docker
(package (package
(name "repo2docker") (name "repo2docker")
(version "2021.03.0") (version "2021.08.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/jupyterhub/repo2docker/") (url "https://github.com/jupyterhub/repo2docker/")
(commit "2021.03.0"))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18w8rgf7fpf79kx36y2c3xi3d52i41z112l3sz719d8kg0bir16m")))) "111irpghzys0s5ixs8paskz7465cls1sm9d5bg45a15jklcw84a9"))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
@ -399,10 +400,14 @@ (define-public repo2docker
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "doc")) (let* ((out (assoc-ref outputs "doc"))
(doc (string-append out "/share/doc/" (doc (string-append out "/share/doc/"
,name))) ,(package-name this-package))))
(setenv "GUIX_PYTHONPATH" (setenv "PYTHONPATH"
(string-append (getcwd) ":" (string-append (getcwd) ":"
(getenv "GUIX_PYTHONPATH"))) (getenv "GUIX_PYTHONPATH")))
;; Don't treat warnings as errors.
(substitute* "docs/Makefile"
(("(SPHINXOPTS[[:blank:]]+= )-W" _ group)
group))
(with-directory-excursion "docs" (with-directory-excursion "docs"
(invoke "make" "html") (invoke "make" "html")
(copy-recursively "build/html" (copy-recursively "build/html"
@ -418,7 +423,7 @@ (define-public repo2docker
python-escapism python-escapism
python-docker)) python-docker))
(native-inputs (native-inputs
(list python-sphinx python-recommonmark (list python-sphinx python-entrypoints python-recommonmark
python-sphinxcontrib-autoprogram python-pydata-sphinx-theme)) python-sphinxcontrib-autoprogram python-pydata-sphinx-theme))
(home-page "https://repo2docker.readthedocs.io/en/latest/index.html#") (home-page "https://repo2docker.readthedocs.io/en/latest/index.html#")
(synopsis "Generate docker images from repositories") (synopsis "Generate docker images from repositories")