diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-09-01T19·35-0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-09-01T19·35-0400 |
| commit | c42eaaf684a6b1f7358d33cfaea1614885467d72 (patch) | |
| tree | 7b3fb732bcd2d8c335348c0cfb50049089fea4ef /doc/manual | |
| parent | 4be7652dd3c577ce0890ee849c041e4cb59a3db7 (diff) | |
Create upgrade notes
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/installation/upgrading.xml | 21 | ||||
| -rw-r--r-- | doc/manual/manual.xml | 1 | ||||
| -rw-r--r-- | doc/manual/release-notes/rl-2.1.xml | 7 |
3 files changed, 22 insertions, 7 deletions
diff --git a/doc/manual/installation/upgrading.xml b/doc/manual/installation/upgrading.xml new file mode 100644 index 000000000000..a3f86ade95cd --- /dev/null +++ b/doc/manual/installation/upgrading.xml @@ -0,0 +1,21 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="ch-upgrading-nix"> + + <title>Upgrading Nix</title> + + <para> + Multi-user Nix users on macOS can upgrade Nix by running + <command>sudo -i sh -c 'nix-channel --update && nix-env + -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo + launchctl start org.nixos.nix-daemon</command>. + </para> + + <para> + Single-user installations of Nix should run <command>nix-channel + --update; nix-env -iA nixpkgs.nix</command>. + </para> + +</chapter> diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index b408b6817727..87d9de28ab14 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -32,6 +32,7 @@ <xi:include href="introduction/introduction.xml" /> <xi:include href="installation/installation.xml" /> + <xi:include href="installation/upgrading.xml" /> <xi:include href="packages/package-management.xml" /> <xi:include href="expressions/writing-nix-expressions.xml" /> <xi:include href="advanced-topics/advanced-topics.xml" /> diff --git a/doc/manual/release-notes/rl-2.1.xml b/doc/manual/release-notes/rl-2.1.xml index 20a8e4ea6cab..3cace13f10f0 100644 --- a/doc/manual/release-notes/rl-2.1.xml +++ b/doc/manual/release-notes/rl-2.1.xml @@ -74,13 +74,6 @@ new features:</para> </itemizedlist> -<para> - Multi-user Nix users on macOS can upgrade Nix by running - <command>sudo -i sh -c 'nix-channel --update && nix-env -iA - nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo - launchctl start org.nixos.nix-daemon</command>. -</para> - <para>This release has contributions from Adrien Devresse, |