ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts: Default to Guile 2.2 as the guile-for-build.

Browse source 
* 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:
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 @@ (define (guix-environment . args)
store store
(if bootstrap? (if bootstrap?
%bootstrap-guile %bootstrap-guile
(canonical-package guile-2.0))))) (canonical-package guile-2.2)))))
(run-with-store store (run-with-store store
;; Containers need a Bourne shell at /bin/sh. ;; Containers need a Bourne shell at /bin/sh.
(mlet* %store-monad ((bash (environment-bash container? (mlet* %store-monad ((bash (environment-bash container?

4
guix/scripts/package.scm
View file

@ -49,7 +49,7 @@ (define-module (guix scripts package)
#:use-module (srfi srfi-37) #:use-module (srfi srfi-37)
#:use-module (gnu packages) #:use-module (gnu packages)
#:autoload (gnu packages base) (canonical-package) #: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) #:autoload (gnu packages bootstrap) (%bootstrap-guile)
#:export (build-and-use-profile #:export (build-and-use-profile
delete-generations delete-generations
@ -918,5 +918,5 @@ (define (handle-argument arg result arg-handler)
(%store) (%store)
(if (assoc-ref opts 'bootstrap?) (if (assoc-ref opts 'bootstrap?)
%bootstrap-guile %bootstrap-guile
(canonical-package guile-2.0))))) (canonical-package guile-2.2)))))
(process-actions (%store) opts))))))) (process-actions (%store) opts)))))))

2
guix/scripts/pull.scm
View file

@ -275,7 +275,7 @@ (define (use-le-certs? url)
store store
(if (assoc-ref opts 'bootstrap?) (if (assoc-ref opts 'bootstrap?)
%bootstrap-guile %bootstrap-guile
(canonical-package guile-2.0))))) (canonical-package guile-2.2)))))
(run-with-store store (run-with-store store
(build-and-install checkout (config-directory) (build-and-install checkout (config-directory)
#:commit commit #:commit commit