~ruther/guix-local

d9721c2096525747c7fbbe008c8100846aefd392 — Ludovic Courtès 8 years ago 98a26dc
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.
3 files changed, 4 insertions(+), 4 deletions(-)

M guix/scripts/environment.scm
M guix/scripts/package.scm
M guix/scripts/pull.scm
M guix/scripts/environment.scm => guix/scripts/environment.scm +1 -1
@@ 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?

M guix/scripts/package.scm => guix/scripts/package.scm +2 -2
@@ 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)))))))

M guix/scripts/pull.scm => guix/scripts/pull.scm +1 -1
@@ 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