[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: self: Build with Guile 3.0.
From: |
guix-commits |
Subject: |
03/04: self: Build with Guile 3.0. |
Date: |
Thu, 23 Jan 2020 17:37:01 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 8234fe653e61d0090138cbd4c48d877568355439
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Jan 23 22:43:17 2020 +0100
self: Build with Guile 3.0.
* guix/self.scm (specification->package): Return the "guile3.0-"
variants.
(guix-derivation): Change 'guile' to (specification->package "guile").
Pass "3.0" as #:guile-version.
---
guix/self.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index f901514..6b633f9 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -48,13 +48,13 @@
(let ((ref (lambda (module variable)
(module-ref (resolve-interface module) variable))))
(match-lambda
- ("guile" (ref '(gnu packages commencement) 'guile-final))
- ("guile-json" (ref '(gnu packages guile) 'guile-json-3))
- ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh))
- ("guile-git" (ref '(gnu packages guile) 'guile-git))
- ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3))
- ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
- ("gnutls" (ref '(gnu packages tls) 'gnutls))
+ ("guile" (ref '(gnu packages guile) 'guile-3.0))
+ ("guile-json" (ref '(gnu packages guile) 'guile3.0-json))
+ ("guile-ssh" (ref '(gnu packages ssh) 'guile3.0-ssh))
+ ("guile-git" (ref '(gnu packages guile) 'guile3.0-git))
+ ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3))
+ ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt))
+ ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls))
("zlib" (ref '(gnu packages compression) 'zlib))
("lzlib" (ref '(gnu packages compression) 'lzlib))
("gzip" (ref '(gnu packages compression) 'gzip))
@@ -1120,9 +1120,9 @@ is not supported."
version))
(define guile
- ;; When PULL-VERSION >= 1, produce a self-contained Guix and use Guile 2.2
- ;; unconditionally.
- (default-guile))
+ ;; When PULL-VERSION >= 1, produce a self-contained Guix and use the
+ ;; current Guile unconditionally.
+ (specification->package "guile"))
(when (and (< pull-version 1)
(not (string=? (package-version guile) guile-version)))
@@ -1141,7 +1141,7 @@ is not supported."
(shorten version))
#:pull-version pull-version
#:guile-version (if (>= pull-version 1)
- "2.2" guile-version)
+ "3.0" guile-version)
#:guile-for-build guile)))
(if guix
(lower-object guix)