public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/doc/releases: update stable release info to 21.05

Browse Source 
(cherry picked from commit 545ba18df2ca2077d6c1a69e02648ad88dd5d968)
This commit is contained in:
Jonathan Ringer 2021-05-31 14:48:15 -07:00 committed by Jonathan Ringer
parent 3a2e0c36e7
commit 9e2c334e52
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/doc/manual/installation/upgrading.xml
View File

@ -14,7 +14,7 @@
<para> <para>
<emphasis>Stable channels</emphasis>, such as <emphasis>Stable channels</emphasis>, such as
<literal <literal
xlink:href="https://nixos.org/channels/nixos-20.09">nixos-20.09</literal>. xlink:href="https://nixos.org/channels/nixos-21.05">nixos-21.05</literal>.
These only get conservative bug fixes and package upgrades. For instance, These only get conservative bug fixes and package upgrades. For instance,
a channel update may cause the Linux kernel on your system to be upgraded a channel update may cause the Linux kernel on your system to be upgraded
from 4.19.34 to 4.19.38 (a minor bug fix), but not from from 4.19.34 to 4.19.38 (a minor bug fix), but not from
@ -38,7 +38,7 @@
<para> <para>
<emphasis>Small channels</emphasis>, such as <emphasis>Small channels</emphasis>, such as
<literal <literal
xlink:href="https://nixos.org/channels/nixos-20.09-small">nixos-20.09-small</literal> xlink:href="https://nixos.org/channels/nixos-21.05-small">nixos-21.05-small</literal>
or or
<literal <literal
xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
@ -63,8 +63,8 @@
<para> <para>
When you first install NixOS, you’re automatically subscribed to the NixOS When you first install NixOS, you’re automatically subscribed to the NixOS
channel that corresponds to your installation source. For instance, if you channel that corresponds to your installation source. For instance, if you
installed from a 20.09 ISO, you will be subscribed to the installed from a 21.05 ISO, you will be subscribed to the
<literal>nixos-20.09</literal> channel. To see which NixOS channel you’re <literal>nixos-21.05</literal> channel. To see which NixOS channel you’re
subscribed to, run the following as root: subscribed to, run the following as root:
<screen> <screen>
<prompt># </prompt>nix-channel --list | grep nixos <prompt># </prompt>nix-channel --list | grep nixos
@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable
<prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos <prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
</screen> </screen>
(Be sure to include the <literal>nixos</literal> parameter at the end.) For (Be sure to include the <literal>nixos</literal> parameter at the end.) For
instance, to use the NixOS 20.09 stable channel: instance, to use the NixOS 21.05 stable channel:
<screen> <screen>
<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09 nixos <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
</screen> </screen>
If you have a server, you may want to use the “small” channel instead: If you have a server, you may want to use the “small” channel instead:
<screen> <screen>
<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
</screen> </screen>
And if you want to live on the bleeding edge: And if you want to live on the bleeding edge:
<screen> <screen>
@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable
kernel, initrd or kernel modules. kernel, initrd or kernel modules.
You can also specify a channel explicitly, e.g. You can also specify a channel explicitly, e.g.
<programlisting> <programlisting>
<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.09; <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-21.05;
</programlisting> </programlisting>
</para> </para>
</section> </section>

2
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-release-21.05"> xml:id="sec-release-21.05">
<title>Release 21.05 (“Okapi”, 2021.05/??)</title> <title>Release 21.05 (“Okapi”, 2021.05/31)</title>
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"