From 348d8e446fbc8f5c9a51a081047de72d735a2a8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 16:47:29 +0200 Subject: doc: Don't support a risky mix of Guix & Nix. * doc/guix.texi (Requirements): Remove instructions for sharing a store and/or a daemon with Nix. --- doc/guix.texi | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 14c4514b31..0d3bb19325 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -794,22 +794,6 @@ GNU Coding Standards}). The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store}). -@cindex Nix, compatibility -When a working installation of @url{https://nixos.org/nix/, the Nix package -manager} is available, you -can instead configure Guix with @code{--disable-daemon}. In that case, -Nix replaces the three dependencies above. - -Guix is compatible with Nix, so it is possible to share the same store -between both. To do so, you must pass @command{configure} not only the -same @code{--with-store-dir} value, but also the same -@code{--localstatedir} value. The latter is essential because it -specifies where the database that stores metadata about the store is -located, among other things. The default values for Nix are -@code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}. -Note that @code{--disable-daemon} is not required if -your goal is to share the store with Nix. - @node Running the Test Suite @section Running the Test Suite -- cgit v1.2.3 From 5510bb01e925e46629de7bf7f04f28eda22a27f4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 28 Sep 2019 00:11:28 +0900 Subject: doc: Add a 'Upgrading Guix' section to the 'Installation' chapter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows a discussion regarding issue #36785 (see: https://bugs.gnu.org/36785). * doc/guix.texi (Upgrading Guix): New section. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 0d3bb19325..a6c1319405 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -513,6 +513,7 @@ ready to use it. * Setting Up the Daemon:: Preparing the build daemon's environment. * Invoking guix-daemon:: Running the build daemon. * Application Setup:: Application-specific setup. +* Upgrading Guix:: Upgrading Guix and its build daemon. @end menu @node Binary Installation @@ -1761,6 +1762,40 @@ invoke the actual linker with this new set of arguments. You can instruct the wrapper to refuse to link against libraries not in the store by setting the @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}. +@node Upgrading Guix +@section Upgrading Guix + +@cindex Upgrading Guix, on a foreign distro + +To upgrade Guix, run: + +@example +guix pull +@end example + +@xref{Invoking guix pull}, for more information. + +@cindex upgrading Guix for the root user, on a foreign distro +@cindex upgrading the Guix daemon, on a foreign distro +@cindex @command{guix pull} for the root user, on a foreign distro + +On a foreign distro, you can upgrade the build daemon by running: + +@example +sudo -i guix pull +@end example + +@noindent +followed by (assuming your distro uses the systemd service management +tool): + +@example +systemctl restart guix-daemon.service +@end example + +On Guix System, upgrading the daemon is achieved by reconfiguring the +system (@pxref{Invoking guix system, @code{guix system reconfigure}}). + @c TODO What else? @c ********************************************************************* -- cgit v1.2.3