aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-06-30 22:16:37 +0200
committerLudovic Courtès <ludo@gnu.org>2017-06-30 23:20:33 +0200
commit66b9183c4f634d9b2ae41176e4eddf0ebb218532 (patch)
tree0802c4be617fd4afe2d1e957412d0152e8e6ae06 /gnu
parent30f17d73d6a4d1596605b2ad5f9b1ce429896d88 (diff)
downloadguix-66b9183c4f634d9b2ae41176e4eddf0ebb218532.tar
guix-66b9183c4f634d9b2ae41176e4eddf0ebb218532.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gtk.scm8
-rw-r--r--gnu/packages/guile.scm9
-rw-r--r--gnu/packages/skribilo.scm2
3 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1d9ee15246..bb80ef6418 100644
--- a/gnu/packages/gtk.scm
+++ b/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
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8887786e20..cdb4fecebb 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
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 78b4806c8c..458d91e569 100644
--- a/gnu/packages/skribilo.scm
+++ b/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")