git.iko.soy/typeable/nixpkgs
on master help sign in
README.md: update stable release links
commit366bebd53aaf6d2ce453590be9c700f8c78f872b authorJonathan Ringer <jonringer117@gmail.com> dateFri 4 Sep 2020, 10:16 (6 years ago) parentce4f40e
3 files changed+12−12
.github/CONTRIBUTING.md+2−2 README.md+2−2 nixos/doc/manual/installation/upgrading.xml+8−8
.github/CONTRIBUTING.md+2−2
@@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi
5353Follow 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).
5454
55551. 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`.
57573. Create a branch for your change, e.g. `git checkout -b backport`.
58584. 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]`.
6060
6161## Reviewing contributions
6262
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 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)
5050* [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)
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/installation/upgrading.xml+8−8
@@ -14,7 +14,7 @@
1414 <para>
1515 <emphasis>Stable channels</emphasis>, such as
1616 <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>.
1818 These only get conservative bug fixes and package upgrades. For instance,
1919 a channel update may cause the Linux kernel on your system to be upgraded
2020 from 4.19.34 to 4.19.38 (a minor bug fix), but not from
@@ -38,7 +38,7 @@
3838 <para>
3939 <emphasis>Small channels</emphasis>, such as
4040 <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>
4242 or
4343 <literal
4444 xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
@@ -63,8 +63,8 @@
6363 <para>
6464 When you first install NixOS, you’re automatically subscribed to the NixOS
6565 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
6868 subscribed to, run the following as root:
6969<screen>
7070<prompt># </prompt>nix-channel --list | grep nixos
@@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable
7575<prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
7676</screen>
7777 (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:
7979<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
8181</screen>
8282 If you have a server, you may want to use the “small” channel instead:
8383<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
8585</screen>
8686 And if you want to live on the bleeding edge:
8787<screen>
@@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable
132132 kernel, initrd or kernel modules.
133133 You can also specify a channel explicitly, e.g.
134134<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;
136136</programlisting>
137137 </para>
138138 </section>