1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00

pull: Install the new Guix in a profile.

* guix/scripts/pull.scm (%pull-version): New variable.
(build-from-source): Pass #:pull-version to BUILD.
(whole-package-for-legacy, derivation->manifest-entry): New procedure.
(build-and-install): Rewrite in terms of 'build-and-use-profile'.
* guix/scripts/system.scm (maybe-suggest-running-guix-pull)[latest]:
Switch to "/current".
* scripts/guix.in (augment-load-paths!): Remove use of
~/.config/guix/latest.
* build-aux/compile-as-derivation.scm: Replace "/guix/latest/" with
"/current/share/guile/site/X.Y"
* guix/scripts.scm (warn-about-old-distro)[age]: Check "/current"
instead of "/latest".
* doc/guix.texi (Invoking guix pull): Document it.
* doc/contributing.texi (Running Guix Before It Is Installed): Remove
footnote about abusing ~/.config/guix/latest.
This commit is contained in:
Ludovic Courtès
2018-05-30 17:50:21 +02:00
parent 8a0d9bc8a3
commit 75e24d7b0e
7 changed files with 94 additions and 56 deletions

View File

@@ -23,25 +23,13 @@
;; IMPORTANT: We must avoid loading any modules from Guix here,
;; because we need to adjust the guile load paths first.
;; It's okay to import modules from core Guile though.
(use-modules (srfi srfi-26))
(define-syntax-rule (push! elt v) (set! v (cons elt v)))
(define (augment-load-paths!)
;; Add installed modules to load-path.
(push! "@guilemoduledir@" %load-path)
(push! "@guileobjectdir@" %load-compiled-path)
;; Add modules fetched by 'guix pull' to load-path.
(let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
(and=> (getenv "HOME")
(cut string-append <> "/.config")))
(cut string-append <> "/guix/latest"))))
(when (and=> updates-dir file-exists?)
;; XXX: Currently 'guix pull' puts both .scm and .go files in
;; UPDATES-DIR.
(push! updates-dir %load-path)
(push! updates-dir %load-compiled-path))))
(push! "@guileobjectdir@" %load-compiled-path))
(define* (main #:optional (args (command-line)))
(unless (getenv "GUIX_UNINSTALLED")