diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-07-02 22:45:33 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-02 22:52:30 +0200 |
commit | 1b0f266e40aead09be95a984bd9c6cec3dff397e (patch) | |
tree | 0076be5d4f4fc82114dc27deb5433f5587126266 /gnu/packages/plotutils.scm | |
parent | 61f81618a87ce4fc3b93c3ac3fa7aa2f148c1ed8 (diff) | |
download | patches-1b0f266e40aead09be95a984bd9c6cec3dff397e.tar patches-1b0f266e40aead09be95a984bd9c6cec3dff397e.tar.gz |
gnu: Switch guile-cairo and dependents to Guile 2.2 again.
Fixes <https://bugs.gnu.org/27551>.
Reported by Leo Famulari <leo@famulari.name>.
This reinstates the following commits:
e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2.
ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5.
0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd.
66b9183c4 * gnu: guile-lib: Switch to Guile 2.2.
and adds the following changes:
* gnu/bootloader/grub.scm (svg->png): Add 'package->derivation' call for
GUILE-2.2. Pass #:guile-for-build to 'gexp->derivation'.
* gnu/build/svg.scm (svg->png): Add 'em' and 'ex' to the 'let-values'
form to account for all the values returned by
'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate.
Diffstat (limited to 'gnu/packages/plotutils.scm')
-rw-r--r-- | gnu/packages/plotutils.scm | 4 |
1 files changed, 2 insertions, 2 deletions
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") |