Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2019-11-15 20:11:35 +01:00
commit f056553c6b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
192 changed files with 6400 additions and 2868 deletions

View file

@ -30,6 +30,7 @@
(define-module (gnu packages sphinx)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
@ -375,13 +376,14 @@ integrate Sphinx documents in web templates and to handle searches.")
(name "python-sphinx-gallery")
(version "0.1.13")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery"
"/archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/sphinx-gallery/sphinx-gallery")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd"))))
"14nbqh9krx2l2y2ylbln6l6w8iak3wac1lngvaf278y1cx7685kg"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests attempt to download <https://docs.python.org/3/objects.inv>,
@ -541,3 +543,25 @@ and several other projects.")
(define-public python2-sphinx-rtd-theme
(package-with-python2 python-sphinx-rtd-theme))
(define-public python-breathe
(package
(name "python-breathe")
(version "4.13.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "breathe" version))
(sha256
(base32
"1aw749n2ry27434qd7gr99dvsrs3x3chyi9aywmhjj1g4m2j6xf6"))))
(build-system python-build-system)
(propagated-inputs
`(("python-docutils" ,python-docutils)
("python-six" ,python-six)
("python-sphinx" ,python-sphinx)))
(home-page "https://github.com/michaeljones/breathe")
(synopsis "ReStructuredText and Sphinx bridge to Doxygen")
(description "This package is an extension to reStructuredText and Sphinx
to be able to read and render the Doxygen xml output.")
(license license:bsd-3)))