From 9b0f8f81860f2fd49825f2aa56387687e7b80eb7 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 13 Jun 2025 09:07:27 +0200 Subject: [PATCH] docs: merge-bot requires authoring by r-ryantm or a committer This brings the listed conditions into sync between `CONTRIBUTING.md`, `maintainers/README.md`, and the nixpkgs-merge-bot README. --- CONTRIBUTING.md | 2 +- maintainers/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8636219cc9ad..3b3e9b4bdb1f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -313,7 +313,7 @@ Container system, boot system and library changes are some examples of the pull To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise: -- the PR author should be @r-ryantm; +- the PR author should be @r-ryantm or a Nixpkgs committer; - the commenter that issued the command should be among the package maintainers; - the package should reside in `pkgs/by-name`. diff --git a/maintainers/README.md b/maintainers/README.md index 2759b0aa7dc1..91da7847fdbc 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -178,7 +178,7 @@ are available under `./scripts/`. See its [README](./scripts/README.md) for further information. # nixpkgs-merge-bot -To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again. +To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name, the commenter is among the package maintainers, and the pull request author is @r-ryantm or a Nixpkgs committer. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again. # Guidelines for Committers