me
/
guix
Archived
1
0
Fork 0
Code

packages: Use Guile 3.0 for grafts. 

* guix/packages.scm (guile-2.0): Rename to...
(guile-for-grafts): ... this, and adjust callers.  Refer to 'guile-3.0'
instead of 'guile-2.0'.
master
Ludovic Courtès 2020-03-27 18:36:20 +01:00
parent 3139739802
commit 2b6fe60599
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/packages.scm
View File

@ -444,12 +444,12 @@ derivations."
(let ((distro (resolve-interface '(gnu packages commencement)))) (let ((distro (resolve-interface '(gnu packages commencement))))
(module-ref distro 'guile-final))) (module-ref distro 'guile-final)))
(define (guile-2.0) (define (guile-for-grafts)
"Return Guile 2.0." "Return the Guile package used to build grafting derivations."
;; FIXME: This is used as a workaround for <https://bugs.gnu.org/28211> when ;; Guile 2.2 would not work due to <https://bugs.gnu.org/28211> when
;; grafting packages. ;; grafting packages.
(let ((distro (resolve-interface '(gnu packages guile)))) (let ((distro (resolve-interface '(gnu packages guile))))
(module-ref distro 'guile-2.0))) (module-ref distro 'guile-3.0)))
(define* (default-guile-derivation #:optional (system (%current-system))) (define* (default-guile-derivation #:optional (system (%current-system)))
"Return the derivation for SYSTEM of the default Guile package used to run "Return the derivation for SYSTEM of the default Guile package used to run
@ -1269,7 +1269,7 @@ This is an internal procedure."
(() (()
drv) drv)
(grafts (grafts
(let ((guile (package-derivation store (guile-2.0) (let ((guile (package-derivation store (guile-for-grafts)
system #:graft? #f))) system #:graft? #f)))
;; TODO: As an optimization, we can simply graft the tip ;; TODO: As an optimization, we can simply graft the tip
;; of the derivation graph since 'graft-derivation' ;; of the derivation graph since 'graft-derivation'
@ -1295,7 +1295,7 @@ system identifying string)."
(graft-derivation store drv grafts (graft-derivation store drv grafts
#:system system #:system system
#:guile #:guile
(package-derivation store (guile-2.0) (package-derivation store (guile-for-grafts)
system #:graft? #f)))) system #:graft? #f))))
drv)))) drv))))