Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

README.md: update stable release links

(cherry picked from commit 366bebd53aaf6d2ce453590be9c700f8c78f872b)

authored by Jonathan Ringer and committed by WORLDofPEACE 67000e6c 523decb1

Changed files
+12 -12
.github
nixos
doc
manual
installation
+2 -2
.github/CONTRIBUTING.md
··· 53 53 Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). 54 54 55 55 1. Take note of the commits in which the change was introduced into `master` branch. 56 - 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. 56 + 2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`. 57 57 3. Create a branch for your change, e.g. `git checkout -b backport`. 58 58 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. 59 - 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`. 59 + 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. 60 60 61 61 ## Reviewing contributions 62 62
+2 -2
README.md
··· 46 46 system, [Hydra](https://hydra.nixos.org/). 47 47 48 48 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) 49 - * [Continuous package builds for the NixOS 20.03 release](https://hydra.nixos.org/jobset/nixos/release-20.03) 49 + * [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09) 50 50 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) 51 - * [Tests for the NixOS 20.03 release](https://hydra.nixos.org/job/nixos/release-20.03/tested#tabs-constituents) 51 + * [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents) 52 52 53 53 Artifacts successfully built with Hydra are published to cache at 54 54 https://cache.nixos.org/. When successful build and test criteria are
+8 -8
nixos/doc/manual/installation/upgrading.xml
··· 14 14 <para> 15 15 <emphasis>Stable channels</emphasis>, such as 16 16 <literal 17 - xlink:href="https://nixos.org/channels/nixos-20.03">nixos-20.03</literal>. 17 + xlink:href="https://nixos.org/channels/nixos-20.09">nixos-20.09</literal>. 18 18 These only get conservative bug fixes and package upgrades. For instance, 19 19 a channel update may cause the Linux kernel on your system to be upgraded 20 20 from 4.19.34 to 4.19.38 (a minor bug fix), but not from ··· 38 38 <para> 39 39 <emphasis>Small channels</emphasis>, such as 40 40 <literal 41 - xlink:href="https://nixos.org/channels/nixos-20.03-small">nixos-20.03-small</literal> 41 + xlink:href="https://nixos.org/channels/nixos-20.09-small">nixos-20.09-small</literal> 42 42 or 43 43 <literal 44 44 xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. ··· 63 63 <para> 64 64 When you first install NixOS, you’re automatically subscribed to the NixOS 65 65 channel that corresponds to your installation source. For instance, if you 66 - installed from a 20.03 ISO, you will be subscribed to the 67 - <literal>nixos-20.03</literal> channel. To see which NixOS channel you’re 66 + installed from a 20.09 ISO, you will be subscribed to the 67 + <literal>nixos-20.09</literal> channel. To see which NixOS channel you’re 68 68 subscribed to, run the following as root: 69 69 <screen> 70 70 <prompt># </prompt>nix-channel --list | grep nixos ··· 75 75 <prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos 76 76 </screen> 77 77 (Be sure to include the <literal>nixos</literal> parameter at the end.) For 78 - instance, to use the NixOS 20.03 stable channel: 78 + instance, to use the NixOS 20.09 stable channel: 79 79 <screen> 80 - <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03 nixos 80 + <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09 nixos 81 81 </screen> 82 82 If you have a server, you may want to use the “small” channel instead: 83 83 <screen> 84 - <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos 84 + <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos 85 85 </screen> 86 86 And if you want to live on the bleeding edge: 87 87 <screen> ··· 132 132 kernel, initrd or kernel modules. 133 133 You can also specify a channel explicitly, e.g. 134 134 <programlisting> 135 - <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.03; 135 + <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.09; 136 136 </programlisting> 137 137 </para> 138 138 </section>