Skip to content

Commit

Permalink
[21.11] update README.md
Browse files Browse the repository at this point in the history
[21.11] update upgrading

[21.11] update release date

run generation
  • Loading branch information
tomberek committed Nov 30, 2021
1 parent 6080ef5 commit af92f1c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).

* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)
* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)
* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)

Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are
Expand Down
16 changes: 8 additions & 8 deletions nixos/doc/manual/from_md/installation/upgrading.chapter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<listitem>
<para>
<emphasis>Stable channels</emphasis>, such as
<link xlink:href="https://nixos.org/channels/nixos-21.05"><literal>nixos-21.05</literal></link>.
<link xlink:href="https://nixos.org/channels/nixos-21.11"><literal>nixos-21.11</literal></link>.
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 from 4.19.34 to 4.19.38 (a minor bug fix),
Expand All @@ -33,7 +33,7 @@
<listitem>
<para>
<emphasis>Small channels</emphasis>, such as
<link xlink:href="https://nixos.org/channels/nixos-21.05-small"><literal>nixos-21.05-small</literal></link>
<link xlink:href="https://nixos.org/channels/nixos-21.11-small"><literal>nixos-21.11-small</literal></link>
or
<link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.
These are identical to the stable and unstable channels
Expand All @@ -60,8 +60,8 @@
<para>
When you first install NixOS, you’re automatically subscribed to the
NixOS channel that corresponds to your installation source. For
instance, if you installed from a 21.05 ISO, you will be subscribed
to the <literal>nixos-21.05</literal> channel. To see which NixOS
instance, if you installed from a 21.11 ISO, you will be subscribed
to the <literal>nixos-21.11</literal> channel. To see which NixOS
channel you’re subscribed to, run the following as root:
</para>
<programlisting>
Expand All @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable
</programlisting>
<para>
(Be sure to include the <literal>nixos</literal> parameter at the
end.) For instance, to use the NixOS 21.05 stable channel:
end.) For instance, to use the NixOS 21.11 stable channel:
</para>
<programlisting>
# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
</programlisting>
<para>
If you have a server, you may want to use the <quote>small</quote>
channel instead:
</para>
<programlisting>
# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
</programlisting>
<para>
And if you want to live on the bleeding edge:
Expand Down Expand Up @@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true;
also specify a channel explicitly, e.g.
</para>
<programlisting language="bash">
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
</programlisting>
</section>
</chapter>
18 changes: 9 additions & 9 deletions nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
<title>Release 21.11 (“Porcupine”, 2021.11/??)</title>
<title>Release 21.11 (“Porcupine”, 2021/11/30)</title>
<para>
In addition to numerous new and upgraded packages, this release has
the following highlights:
Expand Down Expand Up @@ -37,7 +37,7 @@
</listitem>
<listitem>
<para>
kOps now defaults to 1.21.1, which uses containerd as the
kops now defaults to 1.21.1, which uses containerd as the
default runtime.
</para>
</listitem>
Expand Down Expand Up @@ -84,13 +84,13 @@
</listitem>
<listitem>
<para>
Activation scripts can now opt int to be run when running
<literal>nixos-rebuild dry-activate</literal> and detect the
dry activation by reading <literal>$NIXOS_ACTION</literal>.
This allows activation scripts to output what they would
change if the activation was really run. The users/modules
activation script supports this and outputs some of is
actions.
Activation scripts can now, optionally, be run during a
<literal>nixos-rebuild dry-activate</literal> and can detect
the dry activation by reading
<literal>$NIXOS_ACTION</literal>. This allows activation
scripts to output what they would change if the activation was
really run. The users/modules activation script supports this
and outputs some of is actions.
</para>
</listitem>
<listitem>
Expand Down
16 changes: 8 additions & 8 deletions nixos/doc/manual/installation/upgrading.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
automatically from NixOS's Git repository after certain tests have
passed and all packages have been built. These channels are:

- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05).
- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11).
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 from 4.19.34 to 4.19.38 (a minor bug fix), but not
Expand All @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are:
radical changes between channel updates. It's not recommended for
production systems.

- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small)
- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small)
or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
These are identical to the stable and unstable channels described above,
except that they contain fewer binary packages. This means they get updated
Expand All @@ -38,8 +38,8 @@ newest supported stable release.

When you first install NixOS, you're automatically subscribed to the
NixOS channel that corresponds to your installation source. For
instance, if you installed from a 21.05 ISO, you will be subscribed to
the `nixos-21.05` channel. To see which NixOS channel you're subscribed
instance, if you installed from a 21.11 ISO, you will be subscribed to
the `nixos-21.11` channel. To see which NixOS channel you're subscribed
to, run the following as root:

```ShellSession
Expand All @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do
```

(Be sure to include the `nixos` parameter at the end.) For instance, to
use the NixOS 21.05 stable channel:
use the NixOS 21.11 stable channel:

```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
```

If you have a server, you may want to use the "small" channel instead:

```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
```

And if you want to live on the bleeding edge:
Expand Down Expand Up @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel
modules. You can also specify a channel explicitly, e.g.

```nix
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
```
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2111.section.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11}
# Release 21.11 (“Porcupine”, 2021.11/29) {#sec-release-21.11}

In addition to numerous new and upgraded packages, this release has the following highlights:

Expand Down

0 comments on commit af92f1c

Please sign in to comment.