Browse Source

gnu: guile-lib: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-lib)[inputs]: Replace GUILE-2.0 with
GUILE-2.2.
(guile2.0-lib): New variable.
(guile2.2-lib): Mark as deprecated.
* gnu/packages/guile.scm (guile-ics): Use GUILE2.0-LIB.
* gnu/packages/gtk.scm (guile-cairo, guile-rsvg)
(guile-present, guile-gnome): Likewise.
* gnu/packages/skribilo.scm (skribilo): Likewise.
wip-gexp-hygiene
Ludovic Courtès 5 years ago
parent
commit
66b9183c4f
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 8
      gnu/packages/gtk.scm
  2. 9
      gnu/packages/guile.scm
  3. 2
      gnu/packages/skribilo.scm

8
gnu/packages/gtk.scm

@ -793,7 +793,7 @@ application suites.")
effective "/cairo"))
#t))))))
(inputs
`(("guile-lib" ,guile-lib)
`(("guile-lib" ,guile2.0-lib)
("expat" ,expat)
("guile" ,guile-2.0)))
(propagated-inputs
@ -842,7 +842,7 @@ exceptions, macros, and a dynamic programming environment.")
("texinfo" ,texinfo)))
(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
@ -886,7 +886,7 @@ images onto Cairo surfaces.")
(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/")
@ -934,7 +934,7 @@ documents.")
(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

9
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

2
gnu/packages/skribilo.scm

@ -74,7 +74,7 @@
;; The 'skribilo' command needs them, and for people using Skribilo as a
;; library, these inputs are needed as well.
(propagated-inputs `(("guile-reader" ,guile2.0-reader)
("guile-lib" ,guile-lib)))
("guile-lib" ,guile2.0-lib)))
(home-page "http://www.nongnu.org/skribilo/")
(synopsis "Document production tool written in Guile Scheme")

Loading…
Cancel
Save