mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:37:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: guile-lib: Switch to Guile 2.2."

Browse source 
This reverts commit 66b9183c4f.
This commit is contained in:
Leo Famulari 2017-07-01 16:02:46 -04:00
parent 6b820ef15d
commit 5ace0919c2
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/gtk.scm
View file

@ -793,7 +793,7 @@ (define-public guile-cairo
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 @@ (define-public guile-rsvg
("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 @@ (define-public guile-present
(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 @@ (define-public guile-gnome
(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

9
gnu/packages/guile.scm
View file

@ -624,7 +624,7 @@ (define-public guile-ics
("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 @@ (define-public guile-lib
$(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 @@ (define-public guile-lib
;; 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

2
gnu/packages/skribilo.scm
View file

@ -74,7 +74,7 @@ (define-public skribilo
;; 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")