diff options
Diffstat (limited to '.github')
-rw-r--r-- | .github/CODEOWNERS | 4 | ||||
-rw-r--r-- | .github/CONTRIBUTING.md | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index be54040ca2ed..597978aa53b2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -199,9 +199,9 @@ /doc/languages-frameworks/php.section.md @NixOS/php /nixos/tests/php @NixOS/php /pkgs/build-support/build-pecl.nix @NixOS/php -/pkgs/development/interpreters/php @NixOS/php +/pkgs/development/interpreters/php @NixOS/php @jtojnar /pkgs/development/php-packages @NixOS/php -/pkgs/top-level/php-packages.nix @NixOS/php +/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 76bf94785f22..159b9f843480 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -59,6 +59,15 @@ Follow these steps to backport a change into a release branch in compliance with 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]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. +## Criteria for Backporting changes + +Anything that does not cause user or downstream dependency regressions can be backported. This includes: +- New Packages / Modules +- Security / Patch updates +- Version updates which include new functionality (but no breaking changes) +- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) +- Security critical applications (E.g. `firefox`) + ## Generating 21.11 Release Notes Documentation 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. |