mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
parent
98a26dc889
commit
d9721c2096
3 changed files with 4 additions and 4 deletions
|
@ -586,7 +586,7 @@ (define (guix-environment . args)
|
|||
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?
|
||||
|
|
|
@ -49,7 +49,7 @@ (define-module (guix scripts package)
|
|||
#: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 @@ (define (handle-argument arg result arg-handler)
|
|||
(%store)
|
||||
(if (assoc-ref opts 'bootstrap?)
|
||||
%bootstrap-guile
|
||||
(canonical-package guile-2.0)))))
|
||||
(canonical-package guile-2.2)))))
|
||||
(process-actions (%store) opts)))))))
|
||||
|
|
|
@ -275,7 +275,7 @@ (define (use-le-certs? url)
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue