diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-17 15:34:22 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-17 15:36:58 +0100 |
| commit | d8e98e853c781dbd9f0e3167daf67651ce7ed76b (patch) | |
| tree | 56e36abb83fe31eca24effdb6b18812f00678832 /guix/scripts/environment.scm | |
| parent | 2bc1a400aea97106c5ac8237a06908408e204164 (diff) | |
| download | guix-patches-d8e98e853c781dbd9f0e3167daf67651ce7ed76b.tar guix-patches-d8e98e853c781dbd9f0e3167daf67651ce7ed76b.tar.gz | |
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.
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index f04363750e..e2fe8051b9 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 <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? |