03/05: scripts: Refer to (default-guile) instead of 'guile-2.2'.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit d8e98e853c781dbd9f0e3167daf67651ce7ed76b
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Mar 17 15:34:22 2020 +0100

    scripts: Refer to (default-guile) instead of 'guile-2.2'.
    
    This is a followup to b6bee63bed4f013064c0d902e7c8b83ed7514ade.
    
    * guix/scripts/environment.scm (guix-environment): Use (default-guile)
    instead of (canonical-package guile-2.2) when parameterizing
    '%guile-for-build'.
    * guix/scripts/pack.scm (guix-pack): Likewise.
    * guix/scripts/package.scm (guix-package*): Likewise.
    * guix/scripts/pull.scm (guix-pull): Likewise.
---
 guix/scripts/environment.scm | 6 ++----
 guix/scripts/pack.scm        | 2 +-
 guix/scripts/package.scm     | 4 +---
 guix/scripts/pull.scm        | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index f043637..e2fe805 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2018 David Thompson <address@hidden>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2018 Mike Gerwitz <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -38,8 +38,6 @@
   #:use-module (gnu system file-systems)
   #:use-module (gnu packages)
   #:use-module (gnu packages bash)
-  #:use-module (gnu packages commencement)
-  #:use-module (gnu packages guile)
   #:use-module ((gnu packages bootstrap)
                 #:select (bootstrap-executable %bootstrap-guile))
   #:use-module (ice-9 format)
@@ -733,7 +731,7 @@ message if any test fails."
                            store
                            (if bootstrap?
                                %bootstrap-guile
-                               (canonical-package guile-2.2)))))
+                               (default-guile)))))
             (run-with-store store
               ;; Containers need a Bourne shell at /bin/sh.
               (mlet* %store-monad ((bash       (environment-bash container?
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 652b4c6..045fd16 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1027,7 +1027,7 @@ Create a bundle of PACKAGE.\n"))
                                           store
                                           (if (assoc-ref opts 'bootstrap?)
                                               %bootstrap-guile
-                                              (canonical-package guile-2.2))
+                                              (default-guile))
                                           (assoc-ref opts 'system)
                                           #:graft? (assoc-ref opts 'graft?))))
           (let* ((dry-run?    (assoc-ref opts 'dry-run?))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index d2f4f1c..792c458 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -55,8 +55,6 @@
   #:use-module (srfi srfi-35)
   #:use-module (srfi srfi-37)
   #:use-module (gnu packages)
-  #:autoload   (gnu packages base) (canonical-package)
-  #:autoload   (gnu packages guile) (guile-2.2)
   #:autoload   (gnu packages bootstrap) (%bootstrap-guile)
   #:export (build-and-use-profile
             delete-generations
@@ -958,5 +956,5 @@ option processing with 'parse-command-line'."
                              (%store)
                              (if (assoc-ref opts 'bootstrap?)
                                  %bootstrap-guile
-                                 (canonical-package guile-2.2)))))
+                                 (default-guile)))))
               (process-actions (%store) opts)))))))
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 51d4da2..1c54560 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -798,7 +798,7 @@ Use '~/.config/guix/channels.scm' instead."))
                                        store
                                        (if (assoc-ref opts 'bootstrap?)
                                            %bootstrap-guile
-                                           (canonical-package guile-2.2)))))
+                                           (default-guile)))))
                         (with-profile-lock profile
                           (run-with-store store
                             (build-and-install instances profile