mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
scripts: Refer to (default-guile) instead of 'guile-2.2'.
This is a followup to b6bee63bed
.
* 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.
This commit is contained in:
parent
2bc1a400ae
commit
d8e98e853c
4 changed files with 5 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2018 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018 Mike Gerwitz <mtg@gnu.org>
|
||||
;;;
|
||||
;;; 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?
|
||||
|
|
|
@ -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?))
|
||||
|
|
|
@ -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)))))))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue