From fe4766bd9035b11906187796fd2ff7f9fdcca8e7 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 30 Jul 2026 14:14:23 +0100
Subject: [PATCH 1/2] nixbot: migrate buildbot-nix config to nixbot

---
 buildbot-nix.toml |  1 -
 flake.nix         | 13 +++++++++++--
 nixbot.toml       |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 buildbot-nix.toml
 create mode 100644 nixbot.toml

diff --git a/buildbot-nix.toml b/buildbot-nix.toml
deleted file mode 100644
index 2f7c5cbcd687..000000000000
--- a/buildbot-nix.toml
+++ /dev/null
@@ -1 +0,0 @@
-attribute = "buildbot"
diff --git a/flake.nix b/flake.nix
index 4c05c2d3c1a1..bdade91a2eff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,8 @@
           "x86_64-linux"
         ];
 
+        warn = builtins.warn or nixpkgs.lib.warn;
+
         releaseInfo = nixpkgs.lib.importJSON ./release.json;
 
         docsFor =
@@ -176,8 +178,8 @@
       {
         formatter = forSupportedPkgs (pkgs: pkgs.callPackage ./home-manager/formatter.nix { });
 
-        # TODO: increase buildbot testing scope
-        buildbot = forCI (
+        # TODO: increase nixbot testing scope
+        nixbot = forCI (
           system:
           let
             docs = docsFor nixpkgs.legacyPackages.${system};
@@ -200,6 +202,13 @@
           }
         );
 
+        # Alias for nixbot, added 2026-07-30
+        buildbot = forCI (
+          system:
+          warn "Home Manager: `buildbot.${system}` has been renamed to `nixbot.${system}`."
+            self.nixbot.${system}
+        );
+
         packages = forAllPkgs (
           pkgs:
           let
diff --git a/nixbot.toml b/nixbot.toml
new file mode 100644
index 000000000000..c552d3a56ba5
--- /dev/null
+++ b/nixbot.toml
@@ -0,0 +1 @@
+attribute = "nixbot"

From 7a67d67d933f36838cf31a864601331cbbb79325 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 30 Jul 2026 14:15:33 +0100
Subject: [PATCH 2/2] nixbot: build stable branches on push
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nixbot recently added a `build_branches` config option,¹ which allows
specifying additional branches to be built on push. This replaces the
old behaviour where all branches were built on push.

The default branch and merge-queue refs are always built on push and
Pull Requests are considered their own non-push event.

¹: https://github.com/Mic92/nixbot/commit/87c9a409c2e8f91ebcb5069e177f3a045ddfbc1e
---
 nixbot.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixbot.toml b/nixbot.toml
index c552d3a56ba5..92fce11fb478 100644
--- a/nixbot.toml
+++ b/nixbot.toml
@@ -1 +1,4 @@
 attribute = "nixbot"
+# Additional branches to build on push.
+# The default branch and merge-queue branches always build.
+build_branches = ["release-*"]