git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147898 from tomberek/release_bump

nixos/rl-21.11: bump

commit2f0f91fe692b040d79bc0fc8d9af7f166385b752 authorTimothy DeHerrera <tim.deh@pm.me> dateMon 29 Nov 2021, 19:12 (5 years ago) parentf88c8b7b1faa37
5 files changed+30−30
compare with master
unifiedsplit
README.md+2−2 nixos/doc/manual/from_md/installation/upgrading.chapter.xml+8−8 nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+9−9 nixos/doc/manual/installation/upgrading.chapter.md+8−8 nixos/doc/manual/release-notes/rl-2111.section.md+3−3
README.md+2−2
@@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
4646system, [Hydra](https://hydra.nixos.org/).
4747
4848* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
49−* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)
49+* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
5050* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
51−* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)
51+* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
5252
5353Artifacts successfully built with Hydra are published to cache at
5454https://cache.nixos.org/. When successful build and test criteria are
nixos/doc/manual/from_md/installation/upgrading.chapter.xml+8−8
@@ -12,7 +12,7 @@
1212 <listitem>
1313 <para>
1414 <emphasis>Stable channels</emphasis>, such as
15− <link xlink:href="https://nixos.org/channels/nixos-21.05"><literal>nixos-21.05</literal></link>.
15+ <link xlink:href="https://nixos.org/channels/nixos-21.11"><literal>nixos-21.11</literal></link>.
1616 These only get conservative bug fixes and package upgrades. For
1717 instance, a channel update may cause the Linux kernel on your
1818 system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix),
@@ -33,7 +33,7 @@
3333 <listitem>
3434 <para>
3535 <emphasis>Small channels</emphasis>, such as
36− <link xlink:href="https://nixos.org/channels/nixos-21.05-small"><literal>nixos-21.05-small</literal></link>
36+ <link xlink:href="https://nixos.org/channels/nixos-21.11-small"><literal>nixos-21.11-small</literal></link>
3737 or
3838 <link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.
3939 These are identical to the stable and unstable channels
@@ -60,8 +60,8 @@
6060 <para>
6161 When you first install NixOS, you’re automatically subscribed to the
6262 NixOS channel that corresponds to your installation source. For
63− instance, if you installed from a 21.05 ISO, you will be subscribed
64− to the <literal>nixos-21.05</literal> channel. To see which NixOS
63+ instance, if you installed from a 21.11 ISO, you will be subscribed
64+ to the <literal>nixos-21.11</literal> channel. To see which NixOS
6565 channel you’re subscribed to, run the following as root:
6666 </para>
6767 <programlisting>
@@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable
7676</programlisting>
7777 <para>
7878 (Be sure to include the <literal>nixos</literal> parameter at the
79− end.) For instance, to use the NixOS 21.05 stable channel:
79+ end.) For instance, to use the NixOS 21.11 stable channel:
8080 </para>
8181 <programlisting>
82−# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
82+# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
8383</programlisting>
8484 <para>
8585 If you have a server, you may want to use the <quote>small</quote>
8686 channel instead:
8787 </para>
8888 <programlisting>
89−# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
89+# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
9090</programlisting>
9191 <para>
9292 And if you want to live on the bleeding edge:
@@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true;
146146 also specify a channel explicitly, e.g.
147147 </para>
148148 <programlisting language="bash">
149−system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
149+system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
150150</programlisting>
151151 </section>
152152</chapter>
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+9−9
@@ -1,5 +1,5 @@
11<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
2− <title>Release 21.11 (“Porcupine”, 2021.11/??)</title>
2+ <title>Release 21.11 (“Porcupine”, 2021/11/30)</title>
33 <para>
44 In addition to numerous new and upgraded packages, this release has
55 the following highlights:
@@ -37,7 +37,7 @@
3737 </listitem>
3838 <listitem>
3939 <para>
40− kOps now defaults to 1.21.1, which uses containerd as the
40+ kops now defaults to 1.21.1, which uses containerd as the
4141 default runtime.
4242 </para>
4343 </listitem>
@@ -84,13 +84,13 @@
8484 </listitem>
8585 <listitem>
8686 <para>
87− Activation scripts can now opt int to be run when running
88− <literal>nixos-rebuild dry-activate</literal> and detect the
89− dry activation by reading <literal>$NIXOS_ACTION</literal>.
90− This allows activation scripts to output what they would
91− change if the activation was really run. The users/modules
92− activation script supports this and outputs some of is
93− actions.
87+ Activation scripts can now, optionally, be run during a
88+ <literal>nixos-rebuild dry-activate</literal> and can detect
89+ the dry activation by reading
90+ <literal>$NIXOS_ACTION</literal>. This allows activation
91+ scripts to output what they would change if the activation was
92+ really run. The users/modules activation script supports this
93+ and outputs some of is actions.
9494 </para>
9595 </listitem>
9696 <listitem>
nixos/doc/manual/installation/upgrading.chapter.md+8−8
@@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
66automatically from NixOS's Git repository after certain tests have
77passed and all packages have been built. These channels are:
88
9−- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05).
9+- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11).
1010 These only get conservative bug fixes and package upgrades. For
1111 instance, a channel update may cause the Linux kernel on your system
1212 to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
@@ -19,7 +19,7 @@ passed and all packages have been built. These channels are:
1919 radical changes between channel updates. It's not recommended for
2020 production systems.
2121
22−- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small)
22+- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small)
2323 or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
2424 These are identical to the stable and unstable channels described above,
2525 except that they contain fewer binary packages. This means they get updated
@@ -38,8 +38,8 @@ newest supported stable release.
3838
3939When you first install NixOS, you're automatically subscribed to the
4040NixOS channel that corresponds to your installation source. For
41−instance, if you installed from a 21.05 ISO, you will be subscribed to
42−the `nixos-21.05` channel. To see which NixOS channel you're subscribed
41+instance, if you installed from a 21.11 ISO, you will be subscribed to
42+the `nixos-21.11` channel. To see which NixOS channel you're subscribed
4343to, run the following as root:
4444
4545```ShellSession
@@ -54,16 +54,16 @@ To switch to a different NixOS channel, do
5454```
5555
5656(Be sure to include the `nixos` parameter at the end.) For instance, to
57−use the NixOS 21.05 stable channel:
57+use the NixOS 21.11 stable channel:
5858
5959```ShellSession
60−# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
60+# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
6161```
6262
6363If you have a server, you may want to use the "small" channel instead:
6464
6565```ShellSession
66−# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
66+# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
6767```
6868
6969And if you want to live on the bleeding edge:
@@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel
114114modules. You can also specify a channel explicitly, e.g.
115115
116116```nix
117−system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
117+system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
118118```
nixos/doc/manual/release-notes/rl-2111.section.md+3−3
@@ -1,4 +1,4 @@
1−# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11}
1+# Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11}
22
33In addition to numerous new and upgraded packages, this release has the following highlights:
44
@@ -12,7 +12,7 @@ In addition to numerous new and upgraded packages, this release has the followin
1212
1313- PHP now defaults to PHP 8.0, updated from 7.4.
1414
15−- kOps now defaults to 1.21.1, which uses containerd as the default runtime.
15+- kops now defaults to 1.21.1, which uses containerd as the default runtime.
1616
1717- `python3` now defaults to Python 3.9, updated from Python 3.8.
1818
@@ -25,7 +25,7 @@ In addition to numerous new and upgraded packages, this release has the followin
2525 - Hadoop now defaults to Hadoop 3, updated from 2.
2626 - JournalNode, ZKFS and HTTPFS services have been added.
2727
28−- Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`.
28+- Activation scripts can now, optionally, be run during a `nixos-rebuild dry-activate` and can detect the dry activation by reading `$NIXOS_ACTION`.
2929 This allows activation scripts to output what they would change if the activation was really run.
3030 The users/modules activation script supports this and outputs some of is actions.
3131