me
/
guix
Archived
1
0
Fork 0
Code

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 e3ddb1e832.
master
Leo Famulari 2017-07-01 16:02:40 -04:00
parent dc03f32dea
commit f3bb868a71
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/gtk.scm
View File

@ -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

4
gnu/packages/plotutils.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 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.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")