[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: scripts: Default to Guile 2.2 as the guile-for-build.
From: |
Ludovic Courtès |
Subject: |
01/04: scripts: Default to Guile 2.2 as the guile-for-build. |
Date: |
Sun, 3 Dec 2017 17:27:09 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit d9721c2096525747c7fbbe008c8100846aefd392
Author: Ludovic Courtès <address@hidden>
Date: Sun Dec 3 22:13:33 2017 +0100
scripts: Default to Guile 2.2 as the guile-for-build.
* guix/scripts/environment.scm (guix-environment): '%guile-for-build'
now defaults to GUILE-2.2 instead of GUILE-2.0.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
---
guix/scripts/environment.scm | 2 +-
guix/scripts/package.scm | 4 ++--
guix/scripts/pull.scm | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 0d69218..e1b7fee 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -586,7 +586,7 @@ message if any test fails."
store
(if bootstrap?
%bootstrap-guile
- (canonical-package guile-2.0)))))
+ (canonical-package guile-2.2)))))
(run-with-store store
;; Containers need a Bourne shell at /bin/sh.
(mlet* %store-monad ((bash (environment-bash container?
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index f972ca2..0a4a07a 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -49,7 +49,7 @@
#:use-module (srfi srfi-37)
#:use-module (gnu packages)
#:autoload (gnu packages base) (canonical-package)
- #:autoload (gnu packages guile) (guile-2.0)
+ #:autoload (gnu packages guile) (guile-2.2)
#:autoload (gnu packages bootstrap) (%bootstrap-guile)
#:export (build-and-use-profile
delete-generations
@@ -918,5 +918,5 @@ processed, #f otherwise."
(%store)
(if (assoc-ref opts 'bootstrap?)
%bootstrap-guile
- (canonical-package guile-2.0)))))
+ (canonical-package guile-2.2)))))
(process-actions (%store) opts)))))))
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 3e95bd5..be0c168 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -275,7 +275,7 @@ certificates~%"))
store
(if (assoc-ref opts 'bootstrap?)
%bootstrap-guile
- (canonical-package guile-2.0)))))
+ (canonical-package guile-2.2)))))
(run-with-store store
(build-and-install checkout (config-directory)
#:commit commit