···2222 - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
2323- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
2424- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
2525-- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes)
2525+- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
2626 - [ ] (Package updates) Added a release notes entry if the change is major or breaking
2727 - [ ] (Module updates) Added a release notes entry if the change is significant
2828 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
+5-7
CONTRIBUTING.md
···119119- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
120120- Security critical applications (E.g. `firefox`)
121121122122-## Generating 22.05 Release Notes
123123-124124-(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".)
122122+## Generating 22.11 Release Notes
125123126124Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.
127125128128-Steps for updating 22.05 Release notes:
126126+Steps for updating 22.11 Release notes:
129127130130-1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes
131131-2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml`
132132-3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit.
128128+1. Edit `nixos/doc/manual/release-notes/rl-2211.section.md` with the desired changes
129129+2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2211.section.xml`
130130+3. Include changes to `rl-2211.section.md` and `rl-2211.section.xml` in the same commit.
133131134132## Reviewing contributions
135133
···1212 <listitem>
1313 <para>
1414 <emphasis>Stable channels</emphasis>, such as
1515- <link xlink:href="https://nixos.org/channels/nixos-21.11"><literal>nixos-21.11</literal></link>.
1515+ <link xlink:href="https://nixos.org/channels/nixos-22.05"><literal>nixos-22.05</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),
···3333 <listitem>
3434 <para>
3535 <emphasis>Small channels</emphasis>, such as
3636- <link xlink:href="https://nixos.org/channels/nixos-21.11-small"><literal>nixos-21.11-small</literal></link>
3636+ <link xlink:href="https://nixos.org/channels/nixos-22.05-small"><literal>nixos-22.05-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
···6060 <para>
6161 When you first install NixOS, you’re automatically subscribed to the
6262 NixOS channel that corresponds to your installation source. For
6363- instance, if you installed from a 21.11 ISO, you will be subscribed
6464- to the <literal>nixos-21.11</literal> channel. To see which NixOS
6363+ instance, if you installed from a 22.05 ISO, you will be subscribed
6464+ to the <literal>nixos-22.05</literal> channel. To see which NixOS
6565 channel you’re subscribed to, run the following as root:
6666 </para>
6767 <programlisting>
···7676</programlisting>
7777 <para>
7878 (Be sure to include the <literal>nixos</literal> parameter at the
7979- end.) For instance, to use the NixOS 21.11 stable channel:
7979+ end.) For instance, to use the NixOS 22.05 stable channel:
8080 </para>
8181 <programlisting>
8282-# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
8282+# nix-channel --add https://nixos.org/channels/nixos-22.05 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>
8989-# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
8989+# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos
9090</programlisting>
9191 <para>
9292 And if you want to live on the bleeding edge:
···146146 also specify a channel explicitly, e.g.
147147 </para>
148148 <programlisting language="bash">
149149-system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
149149+system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05;
150150</programlisting>
151151 </section>
152152</chapter>
···66automatically from NixOS's Git repository after certain tests have
77passed and all packages have been built. These channels are:
8899-- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11).
99+- *Stable channels*, such as [`nixos-22.05`](https://nixos.org/channels/nixos-22.05).
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
···1919 radical changes between channel updates. It's not recommended for
2020 production systems.
21212222-- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small)
2222+- *Small channels*, such as [`nixos-22.05-small`](https://nixos.org/channels/nixos-22.05-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
···38383939When you first install NixOS, you're automatically subscribed to the
4040NixOS channel that corresponds to your installation source. For
4141-instance, if you installed from a 21.11 ISO, you will be subscribed to
4242-the `nixos-21.11` channel. To see which NixOS channel you're subscribed
4141+instance, if you installed from a 22.05 ISO, you will be subscribed to
4242+the `nixos-22.05` channel. To see which NixOS channel you're subscribed
4343to, run the following as root:
44444545```ShellSession
···5454```
55555656(Be sure to include the `nixos` parameter at the end.) For instance, to
5757-use the NixOS 21.11 stable channel:
5757+use the NixOS 22.05 stable channel:
58585959```ShellSession
6060-# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
6060+# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
6161```
62626363If you have a server, you may want to use the "small" channel instead:
64646565```ShellSession
6666-# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
6666+# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos
6767```
68686969And if you want to live on the bleeding edge:
···114114modules. You can also specify a channel explicitly, e.g.
115115116116```nix
117117-system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
117117+system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05;
118118```
+1-1
nixos/doc/manual/release-notes/rl-2205.section.md
···11-# Release 22.05 (“Quokka”, 2022.05/??) {#sec-release-22.05}
11+# Release 22.05 (“Quokka”, 2022.05/30) {#sec-release-22.05}
2233- Support is planned until the end of December 2022, handing over to 22.11.
44