02/03: packages: Use Guile 3.0 for grafts.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 2b6fe60599d52b449bbf531cfdc4dbf18a14eb2c
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Mar 27 18:36:20 2020 +0100

    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'.
---
 guix/packages.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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