05/06: gnu: vigra, notmuch: Use the Python3 Sphinx variant.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 556530c95c7ba676000dac6da5c0943f99887eb4
Author: Marius Bakke <address@hidden>
Date:   Tue May 14 16:06:25 2019 +0200

    gnu: vigra, notmuch: Use the Python3 Sphinx variant.
    
    * gnu/packages/image.scm (vigra)[native-inputs]: Change PYTHON2-SPHINX to
    PYTHON-SPHINX.
    * gnu/packages/mail.scm (notmuch)[native-inputs]: Likewise.
---
 gnu/packages/image.scm | 2 +-
 gnu/packages/mail.scm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d714a19..a86d0e7 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -893,7 +893,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and 
others.")
    (native-inputs
     `(("doxygen" ,doxygen)
       ("python2-nose" ,python2-nose)
-      ("python2-sphinx" ,python2-sphinx)))
+      ("sphinx" ,python-sphinx)))
    (arguments
     `(#:test-target "check"
       #:phases
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2f56b7b..7346a3f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -897,7 +897,7 @@ invoking @command{notifymuch} from the post-new hook.")
        ("pkg-config" ,pkg-config)
        ("python" ,python-2)
        ("python-docutils" ,python2-docutils)
-       ("python-sphinx" ,python2-sphinx)
+       ("sphinx" ,python-sphinx)
 
        ;; The following are required for tests only.
        ("which" ,which)