03/04: gnu: python-babel: Update to 2.7.0.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 93253411d6a55ebdcd91de2c6eb80e1c9134d12a
Author: Marius Bakke <address@hidden>
Date:   Tue Jun 18 15:21:21 2019 +0200

    gnu: python-babel: Update to 2.7.0.
    
    * gnu/packages/python-xyz.scm (python-babel): Update to 2.7.0.
    (python2-babel-2.6): New variable.
    * gnu/packages/sphinx.scm (python2-sphinx)[propagated-inputs]: Change
    PYTHON2-BABEL to PYTHON2-BABEL-2.6.
---
 gnu/packages/python-xyz.scm | 16 ++++++++++++++--
 gnu/packages/sphinx.scm     |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 466b2d8..c072cf574 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -311,14 +311,14 @@ by @code{binstar}, @code{binstar-build} and 
@code{chalmers}.")
 (define-public python-babel
   (package
     (name "python-babel")
-    (version "2.6.0")
+    (version "2.7.0")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "Babel" version))
       (sha256
        (base32
-        "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc"))))
+        "0a7wawx8vsg7igvz6p3x909fskhg4b2y1910xk4f4c8y22p3aqg8"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-freezegun" ,python-freezegun)
@@ -343,6 +343,18 @@ etc. ")
 (define-public python2-babel
   (package-with-python2 python-babel))
 
+;; Sphinx < 2.0 requires this version.  Remove once no longer needed.
+(define-public python2-babel-2.6
+  (package
+    (inherit python2-babel)
+    (version "2.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Babel" version))
+              (sha256
+               (base32
+                "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc"))))))
+
 (define-public python2-backport-ssl-match-hostname
   (package
     (name "python2-backport-ssl-match-hostname")
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 0b86398..a9475ab 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -132,7 +132,7 @@ sources.")
                            ("python2-imagesize" ,python2-imagesize)
                            ("python2-sphinx-alabaster-theme"
                             ,python2-sphinx-alabaster-theme)
-                           ("python2-babel" ,python2-babel)
+                           ("python2-babel" ,python2-babel-2.6)
                            ("python2-snowballstemmer" ,python2-snowballstemmer)
                            ("python2-docutils" ,python2-docutils)
                            ("python2-jinja2" ,python2-jinja2)