nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

self: Fix package names for compilation with Guile 2.0. 

Reported by Ricardo Wurmus.

* guix/self.scm (specification->package): Add guile2.0-{json,git,ssh}.
(guile-for-build): Use 'module-ref' for Guile 2.0.
This commit is contained in:
Ludovic Courtès 2018-04-10 14:36:18 +02:00
parent 69447b6393
commit e69dd8443a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/self.scm
View File

@ -88,7 +88,11 @@ GUILE-VERSION (\"2.0\" or \"2.2\"), or #f if none of the packages matches."
("bzip2" (ref '(gnu packages compression) 'bzip2)) ("bzip2" (ref '(gnu packages compression) 'bzip2))
("xz" (ref '(gnu packages compression) 'xz)) ("xz" (ref '(gnu packages compression) 'xz))
("guix" (ref '(gnu packages package-management) ("guix" (ref '(gnu packages package-management)
'guix-register))))) 'guix-register))
("guile2.0-json" (ref '(gnu packages guile) 'guile2.0-json))
("guile2.0-ssh" (ref '(gnu packages ssh) 'guile2.0-ssh))
("guile2.0-git" (ref '(gnu packages guile) 'guile2.0-git))
(_ #f)))) ;no such package
;;; ;;;
@ -576,7 +580,8 @@ running Guile."
(canonical-package (module-ref (resolve-interface '(gnu packages guile)) (canonical-package (module-ref (resolve-interface '(gnu packages guile))
'guile-2.2/fixed))) 'guile-2.2/fixed)))
("2.0" ("2.0"
(canonical-package (specification->package "guile@2.0"))))) (module-ref (resolve-interface '(gnu packages guile))
'guile-2.0))))
(define* (guix-derivation source version (define* (guix-derivation source version
#:optional (guile-version (effective-version))) #:optional (guile-version (effective-version)))