aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-07-01 16:02:46 -0400
committerLeo Famulari <leo@famulari.name>2017-07-01 16:08:47 -0400
commit5ace0919c2b725d115903042ece0ac5904d074fd (patch)
treedcdaf4f87909e44048793971f6a06295e51274b3
parent6b820ef15d532a3d0016be657a99d88377c7e03c (diff)
downloadpatches-5ace0919c2b725d115903042ece0ac5904d074fd.tar
patches-5ace0919c2b725d115903042ece0ac5904d074fd.tar.gz
Revert "gnu: guile-lib: Switch to Guile 2.2."
This reverts commit 66b9183c4f634d9b2ae41176e4eddf0ebb218532.
-rw-r--r--gnu/packages/gtk.scm8
-rw-r--r--gnu/packages/guile.scm9
-rw-r--r--gnu/packages/skribilo.scm2
3 files changed, 8 insertions, 11 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bb80ef6418..1d9ee15246 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -793,7 +793,7 @@ application suites.")
effective "/cairo"))
#t))))))
(inputs
- `(("guile-lib" ,guile2.0-lib)
+ `(("guile-lib" ,guile-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" ,guile2.0-lib))) ;for (unit-test)
+ ("guile-lib" ,guile-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" ,guile2.0-lib)
+ `(("guile-lib" ,guile-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" ,guile2.0-lib)))
+ ("guile-lib" ,guile-lib)))
(arguments
`(#:tests? #f ;FIXME
#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6bff343429..7f6d15515c 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" ,guile2.0-lib)))
+ (propagated-inputs `(("guile-lib" ,guile-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.2)))
+ (inputs `(("guile" ,guile-2.0)))
(home-page "http://www.nongnu.org/guile-lib/")
(synopsis "Collection of useful Guile Scheme modules")
(description
@@ -675,11 +675,8 @@ for Guile\".")
;; details.
(license license:gpl3+)))
-(define-public guile2.0-lib
- (package-for-guile-2.0 guile-lib))
-
(define-public guile2.2-lib
- (deprecated-package "guile2.2-lib" guile-lib))
+ (package-for-guile-2.2 guile-lib))
(define-public guile-json
(package
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 458d91e569..78b4806c8c 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" ,guile2.0-lib)))
+ ("guile-lib" ,guile-lib)))
(home-page "http://www.nongnu.org/skribilo/")
(synopsis "Document production tool written in Guile Scheme")