From: Danny Milosavljevic <dannym@scratchpost.org>
To: guix-devel@gnu.org
Subject: [WIP v3 5/5] gnu: Update Sphinx to 1.4.8
Date: Thu, 13 Oct 2016 08:40:46 +0200 [thread overview]
Message-ID: <20161013064046.14200-6-dannym@scratchpost.org> (raw)
In-Reply-To: <20161013064046.14200-1-dannym@scratchpost.org>
* gnu/packages/python.scm (python-sphinx, python2-sphinx): Updated.
---
gnu/packages/python.scm | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6adedcd..a9d99df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2802,31 +2802,44 @@ reStructuredText.")
(define-public python-sphinx
(package
(name "python-sphinx")
- (version "1.2.3")
+ (version "1.4.8")
(source
(origin
(method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-"
- version ".tar.gz"))
+ (uri (pypi-uri "Sphinx" version))
(sha256
(base32
- "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl"))))
+ "0zvh8wwhm6gy21rr0cg42znsy4zzv2mnsxxk9gmn5y1ycn7rgbs1"))))
(build-system python-build-system)
- (inputs
- `(("python-setuptools" ,python-setuptools)
- ("python-jinja2" ,python-jinja2)
+ (propagated-inputs
+ `(("python-imagesize" ,python-imagesize)
+ ("python-sphinx-alabaster-theme-0.7"
+ ,python-sphinx-alabaster-theme-0.7)
+ ("python-babel" ,python-babel)
+ ("python-snowballstemmer" ,python-snowballstemmer)
("python-docutils" ,python-docutils)
- ("python-pygments" ,python-pygments)))
+ ("python-jinja2" ,python-jinja2)
+ ("python-pygments" ,python-pygments)
+ ("python-six" ,python-six)))
+ (native-inputs
+ `(("python-simplejson" ,python-simplejson)))
(home-page "http://sphinx-doc.org/")
(synopsis "Python documentation generator")
(description "Sphinx is a tool that makes it easy to create documentation
for Python projects or other documents consisting of multiple reStructuredText
sources.")
- (license license:bsd-3)))
+ (license license:bsd-3)
+ (properties `((python2-variant . ,(delay python2-sphinx))))))
(define-public python2-sphinx
- (package-with-python2 python-sphinx))
+ (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-mock" ,python2-mock)
+ ("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base)))
+ (propagated-inputs `(("python2-pytz" ,python2-pytz)
+ ,@(package-propagated-inputs base))))))
(define-public python-sphinx-rtd-theme
(package
next prev parent reply other threads:[~2016-10-13 6:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 6:40 [WIP v3 0/5] Update Sphinx to 1.4.8 Danny Milosavljevic
2016-10-13 6:40 ` [WIP v3 1/5] gnu: Add python-snowballstemmer Danny Milosavljevic
2016-10-13 6:40 ` [WIP v3 2/5] gnu: Add python-sphinx-cloud-sptheme Danny Milosavljevic
2016-10-13 6:40 ` [WIP v3 3/5] gnu: Add python-sphinx-alabaster-theme Danny Milosavljevic
2016-10-13 6:40 ` [WIP v3 4/5] gnu: Add python-imagesize Danny Milosavljevic
2016-10-13 6:40 ` Danny Milosavljevic [this message]
2016-10-13 6:45 ` [WIP v3 0/5] Update Sphinx to 1.4.8 Danny Milosavljevic
2016-10-13 7:41 ` Danny Milosavljevic
2016-10-13 21:16 ` Danny Milosavljevic
2016-10-14 10:09 ` Hartmut Goebel
2016-12-20 14:11 ` Ludovic Courtès
2017-01-04 20:46 ` Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161013064046.14200-6-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).