From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH v4 1/1] gnu: python-sphinx: Update to 1.4.8. Date: Wed, 4 Jan 2017 21:54:43 +0100 Message-ID: <20170104205443.16489-2-dannym@scratchpost.org> References: <20170104205443.16489-1-dannym@scratchpost.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOsaC-0000uT-4I for guix-devel@gnu.org; Wed, 04 Jan 2017 15:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOsaA-0007KH-2h for guix-devel@gnu.org; Wed, 04 Jan 2017 15:54:52 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:35986) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOsa9-0007Iy-Sf for guix-devel@gnu.org; Wed, 04 Jan 2017 15:54:50 -0500 In-Reply-To: <20170104205443.16489-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)[version]: Update to 1.4.8. --- gnu/packages/python.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d80296339..4e1a6b4a8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2907,30 +2907,43 @@ 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) (propagated-inputs - `(("python-jinja2" ,python-jinja2) + `(("python-imagesize" ,python-imagesize) + ("python-sphinx-alabaster-theme" + ,python-sphinx-alabaster-theme) + ("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) + ,@(package-native-inputs base))) + (propagated-inputs `(("python2-pytz" ,python2-pytz) + ,@(package-propagated-inputs base)))))) (define-public python-sphinx-rtd-theme (package