diff options
| author | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-09-06 13:58:45 +0200 |
|---|---|---|
| committer | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-09-06 20:12:50 +0200 |
| commit | 433f935d1036aefe3b18e19c901986d6299f91bd (patch) | |
| tree | 308ba20df0d925ed051c7d8b94d9ea97c3f1360a /CONTRIBUTING.md | |
| parent | 6d95b1aebba5a1c6452406d6c3c75c84ac9e37ea (diff) | |
CONTRIBUTING.md: Reword changes acceptable for backport
It wasn't entirely clear if the list was acceptable or not from the
wording.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 616fd4c22013..e30a4bb0f95e 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 |