Merge branch 'master' into staging

1 files changed, 10 insertions, 4 deletions

diff --git a/guix/self.scm b/guix/self.scm
index 89c542803..c9c7138e6 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -343,7 +343,7 @@ DOMAIN, a gettext domain."
 
 (define* (guix-command modules #:optional compiled-modules
                        #:key source (dependencies '())
-                       (guile-version (effective-version)))
+                       guile (guile-version (effective-version)))
   "Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its
 load path."
   (program-file "guix-command"
@@ -383,15 +383,17 @@ load path."
 
                       ;; XXX: It would be more convenient to change it to:
                       ;;   (exit (apply guix-main (command-line)))
-                      (apply guix-main (command-line))))))
+                      (apply guix-main (command-line))))
+                #:guile guile))
 
 (define* (whole-package name modules dependencies
                         #:key
                         (guile-version (effective-version))
                         compiled-modules
-                        info daemon
+                        info daemon guile
                         (command (guix-command modules
                                                #:dependencies dependencies
+                                               #:guile guile
                                                #:guile-version guile-version)))
   "Return the whole Guix package NAME that uses MODULES, a derivation of all
 the modules, and DEPENDENCIES, a list of packages depended on.  COMMAND is the
@@ -630,10 +632,12 @@ assumed to be part of MODULES."
                 (command  (guix-command modules compiled
                                         #:source source
                                         #:dependencies dependencies
+                                        #:guile guile-for-build
                                         #:guile-version guile-version)))
            (whole-package name modules dependencies
                           #:compiled-modules compiled
                           #:command command
+                          #:guile guile-for-build
 
                           ;; Include 'guix-daemon'.  XXX: Here we inject an
                           ;; older snapshot of guix-daemon, but that's a good
@@ -903,8 +907,10 @@ running Guile."
      (module-ref (resolve-interface '(gnu packages guile))
                  'guile-2.2.2))
     ("2.2"
+     ;; Use the latest version, which has fixes for
+     ;; <https://bugs.gnu.org/30602> and VM stack-marking issues.
      (canonical-package (module-ref (resolve-interface '(gnu packages guile))
-                                    'guile-2.2/fixed)))
+                                    'guile-2.2.4)))
     ("2.0"
      (module-ref (resolve-interface '(gnu packages guile))
                  'guile-2.0))))