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/guile.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/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7f6d15515c..6bff343429 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -624,7 +624,7 @@ format is also supported.") ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) ("which" ,which))) - (propagated-inputs `(("guile-lib" ,guile-lib))) + (propagated-inputs `(("guile-lib" ,guile2.0-lib))) (home-page "https://github.com/artyom-poptsov/guile-ics") (synopsis "Guile parser library for the iCalendar format") (description @@ -661,7 +661,7 @@ The library is shipped with documentation in Info format and usage examples.") $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))) + (inputs `(("guile" ,guile-2.2))) (home-page "http://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -675,8 +675,11 @@ for Guile\".") ;; details. (license license:gpl3+))) +(define-public guile2.0-lib + (package-for-guile-2.0 guile-lib)) + (define-public guile2.2-lib - (package-for-guile-2.2 guile-lib)) + (deprecated-package "guile2.2-lib" guile-lib)) (define-public guile-json (package |