01/04: Revert "gnu: guile-cairo: Switch to Guile 2.2."

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit f3bb868a712dea082db4ad66abce08b9554a43b7
Author: Leo Famulari <address@hidden>
Date:   Sat Jul 1 16:02:40 2017 -0400

    Revert "gnu: guile-cairo: Switch to Guile 2.2."
    
    This commit caused the build of grub-image.png to fail, prevent the
    build of grub.cfg and reconfiguring of GuixSD:
    
    <https://bugs.gnu.org/27551>
    
    This reverts commit e3ddb1e83296c10338d35bc687772242b2f5eac6.
---
 gnu/packages/gtk.scm       | 16 ++++++++--------
 gnu/packages/plotutils.scm |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d5b4720..4126969 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -793,9 +793,9 @@ application suites.")
                                                      effective "/cairo"))
                         #t))))))
     (inputs
-     `(("guile-lib" ,guile-lib)
+     `(("guile-lib" ,guile2.0-lib)
        ("expat" ,expat)
-       ("guile" ,guile-2.2)))
+       ("guile" ,guile-2.0)))
     (propagated-inputs
      ;; The .pc file refers to 'cairo'.
      `(("cairo" ,cairo)))
@@ -846,9 +846,9 @@ exceptions, macros, and a dynamic programming environment.")
                        ("automake" ,automake)
                        ("libtool" ,libtool)
                        ("texinfo" ,texinfo)))
-      (inputs `(("guile" ,guile-2.2)
+      (inputs `(("guile" ,guile-2.0)
                 ("librsvg" ,librsvg)
-                ("guile-lib" ,guile-lib)))        ;for (unit-test)
+                ("guile-lib" ,guile2.0-lib)))        ;for (unit-test)
       (propagated-inputs `(("guile-cairo" ,guile-cairo)))
       (synopsis "Render SVG images using Cairo from Guile")
       (description
@@ -889,10 +889,10 @@ images onto Cairo surfaces.")
                                        out "/share/guile/site/2.0 ")))))
                  %standard-phases)))
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)))
+    (inputs `(("guile" ,guile-2.0)))
     (propagated-inputs
      ;; These are used by the (present …) modules.
-     `(("guile-lib" ,guile-lib)
+     `(("guile-lib" ,guile2.0-lib)
        ("guile-cairo" ,guile-cairo)
        ("guile-rsvg" ,guile-rsvg)))
     (home-page "http://wingolog.org/software/guile-present/";)
@@ -936,11 +936,11 @@ documents.")
        ("pango" ,pango)
        ("libffi" ,libffi)
        ("glib" ,glib)))
-    (inputs `(("guile" ,guile-2.2)))
+    (inputs `(("guile" ,guile-2.0)))
     (propagated-inputs
      `(("guile-cairo" ,guile-cairo)
        ("g-wrap" ,g-wrap)
-       ("guile-lib" ,guile-lib)))
+       ("guile-lib" ,guile2.0-lib)))
     (arguments
       `(#:tests? #f                               ;FIXME
         #:phases (modify-phases %standard-phases
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 482ae1b..f94d569 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
 ;;; Copyright © 2016, 2017 Nicolas Goaziou <address@hidden>
 ;;;
@@ -100,7 +100,7 @@ scientific data.")
                      "godir = $(moddir)\n"))))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)))
+    (inputs `(("guile" ,guile-2.0)))
     (propagated-inputs `(("guile-cairo" ,guile-cairo)))
     (home-page "http://wingolog.org/software/guile-charting/";)
     (synopsis "Create charts and graphs in Guile")