diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-06-30 23:10:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-06-30 23:20:34 +0200 |
| commit | e3ddb1e83296c10338d35bc687772242b2f5eac6 (patch) | |
| tree | cfdcf5d069cfc6a7222218c3a6775dff641f112d /gnu | |
| parent | ae5c6ef39378a6fa1f6bf06e8c7f50ab190c485d (diff) | |
gnu: guile-cairo: Switch to Guile 2.2.
This patch adjusts dependent packages accordingly.
* gnu/packages/gtk.scm (guile-cairo)[inputs]: Switch to GUILE-2.2 and
GUILE-LIB.
(guile-rsvg)[inputs]: Likewise.
(guile-present)[inputs]: Likewise.
(guile-gnome)[inputs]: Likewise.
* gnu/packages/plotutils.scm (guile-charting)[inputs]: Switch go
GUILE-2.2.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gtk.scm | 16 | ||||
| -rw-r--r-- | 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 4126969127..d5b472049d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -793,9 +793,9 @@ application suites.") effective "/cairo")) #t)))))) (inputs - `(("guile-lib" ,guile2.0-lib) + `(("guile-lib" ,guile-lib) ("expat" ,expat) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (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.0) + (inputs `(("guile" ,guile-2.2) ("librsvg" ,librsvg) - ("guile-lib" ,guile2.0-lib))) ;for (unit-test) + ("guile-lib" ,guile-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.0))) + (inputs `(("guile" ,guile-2.2))) (propagated-inputs ;; These are used by the (present …) modules. - `(("guile-lib" ,guile2.0-lib) + `(("guile-lib" ,guile-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.0))) + (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile-cairo" ,guile-cairo) ("g-wrap" ,g-wrap) - ("guile-lib" ,guile2.0-lib))) + ("guile-lib" ,guile-lib))) (arguments `(#:tests? #f ;FIXME #:phases (modify-phases %standard-phases diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index f94d56992e..482ae1b862 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 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; @@ -100,7 +100,7 @@ scientific data.") "godir = $(moddir)\n")))))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))) + (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile-cairo" ,guile-cairo))) (home-page "http://wingolog.org/software/guile-charting/") (synopsis "Create charts and graphs in Guile") |