From 66396918c52acb5d5b23223a528e26bf84d5fbfd Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Feb 2026 15:58:12 -0500 Subject: [PATCH 1/2] CONTRIBUTING: clarify merge bot must be used by maintainer on targeted branch --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e1dfa237ea9..679e4a220bd7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -329,7 +329,7 @@ You can invoke the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot mer The bot will verify the following conditions, refusing to merge otherwise: - the PR author should be @r-ryantm or a Nixpkgs committer; -- the invoker should be among the package maintainers; +- the invoker should be among the package maintainers on the targeted branch; - the package should reside in `pkgs/by-name`. Further, nixpkgs-merge-bot will ensure all CI checks and the ofborg builds for Linux have successfully completed before merging the pull request. From 4f5227c3cd154525a0ccd7de1fe1fb697d5e03d0 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Feb 2026 16:03:52 -0500 Subject: [PATCH 2/2] CONTRIBUTING: Ofborg is not required to use merge bot --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 679e4a220bd7..9d2b42e194d2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -332,8 +332,7 @@ The bot will verify the following conditions, refusing to merge otherwise: - the invoker should be among the package maintainers on the targeted branch; - the package should reside in `pkgs/by-name`. -Further, nixpkgs-merge-bot will ensure all CI checks and the ofborg builds for Linux have successfully completed before merging the pull request. -Should the checks still be underway, the bot will wait for them to finish before attempting the merge again. +Required status checks prevent PRs that fail them ("PR / ..." jobs) from being merged. Ofborg is not required by the checks. For other pull requests, please see [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).