From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [WIP v3 5/5] gnu: Update Sphinx to 1.4.8 Date: Thu, 13 Oct 2016 08:40:46 +0200 Message-ID: <20161013064046.14200-6-dannym@scratchpost.org> References: <20161013064046.14200-1-dannym@scratchpost.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZhR-0002nu-9E for guix-devel@gnu.org; Thu, 13 Oct 2016 02:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buZhN-0006B5-HQ for guix-devel@gnu.org; Thu, 13 Oct 2016 02:41:04 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:32999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buZhN-0006Au-AM for guix-devel@gnu.org; Thu, 13 Oct 2016 02:41:01 -0400 In-Reply-To: <20161013064046.14200-1-dannym@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.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