me/guix
Archived
1
0
Fork 0
Code Activity

self: Build with Guile 3.0.

Browse source 
* guix/self.scm (specification->package): Return the "guile3.0-"
variants.
(guix-derivation): Change 'guile' to (specification->package "guile").
Pass "3.0" as #:guile-version.
This commit is contained in:
Ludovic Courtès 2020-01-23 22:43:17 +01:00
parent 370891d565
commit 8234fe653e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
guix/self.scm
View file

@ -48,13 +48,13 @@
(let ((ref (lambda (module variable) (let ((ref (lambda (module variable)
(module-ref (resolve-interface module) variable)))) (module-ref (resolve-interface module) variable))))
(match-lambda (match-lambda
("guile" (ref '(gnu packages commencement) 'guile-final)) ("guile" (ref '(gnu packages guile) 'guile-3.0))
("guile-json" (ref '(gnu packages guile) 'guile-json-3)) ("guile-json" (ref '(gnu packages guile) 'guile3.0-json))
("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-ssh" (ref '(gnu packages ssh) 'guile3.0-ssh))
("guile-git" (ref '(gnu packages guile) 'guile-git)) ("guile-git" (ref '(gnu packages guile) 'guile3.0-git))
("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3))
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt))
("gnutls" (ref '(gnu packages tls) 'gnutls)) ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls))
("zlib" (ref '(gnu packages compression) 'zlib)) ("zlib" (ref '(gnu packages compression) 'zlib))
("lzlib" (ref '(gnu packages compression) 'lzlib)) ("lzlib" (ref '(gnu packages compression) 'lzlib))
("gzip" (ref '(gnu packages compression) 'gzip)) ("gzip" (ref '(gnu packages compression) 'gzip))
@ -1120,9 +1120,9 @@ is not supported."
version)) version))
(define guile (define guile
;; When PULL-VERSION >= 1, produce a self-contained Guix and use Guile 2.2 ;; When PULL-VERSION >= 1, produce a self-contained Guix and use the
;; unconditionally. ;; current Guile unconditionally.
(default-guile)) (specification->package "guile"))
(when (and (< pull-version 1) (when (and (< pull-version 1)
(not (string=? (package-version guile) guile-version))) (not (string=? (package-version guile) guile-version)))
@ -1141,7 +1141,7 @@ is not supported."
(shorten version)) (shorten version))
#:pull-version pull-version #:pull-version pull-version
#:guile-version (if (>= pull-version 1) #:guile-version (if (>= pull-version 1)
"2.2" guile-version) "3.0" guile-version)
#:guile-for-build guile))) #:guile-for-build guile)))
(if guix (if guix
(lower-object guix) (lower-object guix)