diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-05-30 17:50:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-09 12:02:27 +0200 |
| commit | 75e24d7b0e19ab2164aecb340e82d07d2b9714e7 (patch) | |
| tree | 7e46b4d70532dc16482c57f94b6257b42600c04b /build-aux | |
| parent | 8a0d9bc8a3f153159d9e239a151c0fa98f1e12d8 (diff) | |
| download | patches-75e24d7b0e19ab2164aecb340e82d07d2b9714e7.tar patches-75e24d7b0e19ab2164aecb340e82d07d2b9714e7.tar.gz | |
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.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/compile-as-derivation.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/compile-as-derivation.scm b/build-aux/compile-as-derivation.scm index 2a45e71bb9..59a84b1415 100644 --- a/build-aux/compile-as-derivation.scm +++ b/build-aux/compile-as-derivation.scm @@ -25,7 +25,8 @@ (and=> (or (getenv "XDG_CONFIG_HOME") (and=> (getenv "HOME") (cut string-append <> "/.config"))) - (cut string-append <> "/guix/latest"))) + (cute string-append <> "/guix/current/share/guile/site/" + (effective-version)))) (use-modules (guix) (guix ui) (guix git-download) |