nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Ludovic Courtès 2017-12-03 22:13:33 +01:00
parent 98a26dc889
commit d9721c2096
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/scripts/environment.scm
View File

@ -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?

4
guix/scripts/package.scm
View File

@ -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)))))))

2
guix/scripts/pull.scm
View File

@ -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