summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-10 14:36:18 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-10 17:44:27 +0200
commite69dd8443ad2b8620c3a3db874dc50e06b0d43d0 (patch)
tree5eeeba8aa18481e98fdd2469aa723157c461ee8f
parent69447b6393d6f2c3528e3964c7c5f30f710aaa85 (diff)
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.
-rw-r--r--guix/self.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/guix/self.scm b/guix/self.scm
index dbe942cf23..f2e912c85d 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -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))
("xz" (ref '(gnu packages compression) 'xz))
("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))
'guile-2.2/fixed)))
("2.0"
- (canonical-package (specification->package "guile@2.0")))))
+ (module-ref (resolve-interface '(gnu packages guile))
+ 'guile-2.0))))
(define* (guix-derivation source version
#:optional (guile-version (effective-version)))