diff options
| -rw-r--r-- | .github/workflows/backport.yml | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 81fc5306fea1c..131a52b0560bc 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -31,5 +31,5 @@ jobs: pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. - * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes). - * Even as a non-commiter, if you find that it does not comply, leave a comment. + * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases). + * Even as a non-commiter, if you find that it is not acceptable, leave a comment. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 616fd4c220138..e30a4bb0f95ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -483,17 +483,17 @@ The oldest supported release (`YYMM`) can be found using nix-instantiate --eval -A lib.trivial.oldestSupportedRelease ``` -The release branches should generally not receive any breaking changes, both for the Nix expressions and derivations. -So these changes are acceptable to backport: -- New packages, modules and functions -- Security fixes -- Package version updates - - Patch versions with fixes - - Minor versions with new functionality, but no breaking changes +The release branches should generally only receive backwards-compatible changes, both for the Nix expressions and derivations. +Here are some examples of backwards-compatible changes that are okay to backport: +- ✔️ New packages, modules and functions +- ✔️ Security fixes +- ✔️ Package version updates + - ✔️ Patch versions with fixes + - ✔️ Minor versions with new functionality, but no breaking changes In addition, major package version updates with breaking changes are also acceptable for: -- Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord` -- Security critical applications, such as `firefox` and `chromium` +- ✔️ Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord` +- ✔️ Security critical applications, such as `firefox` and `chromium` ### Changes causing mass rebuilds [mass-rebuild]: #changes-causing-mass-rebuilds |