From 5181f1d1b8116ca0f881c437883c56bd65cc54af Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 13 May 2025 09:44:58 +1000
Subject: [PATCH 1/2] DROP

---
 flake.lock | 14 +++++++-------
 flake.nix  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e78d6bea..50095196c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,19 +45,19 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746279357,
-        "narHash": "sha256-oBuu7hOtoqj3BbHp9H/8n8htBt9pMCDDRgrhA6yy0i8=",
-        "ref": "nixos-unstable-small",
-        "rev": "a4b6cee9ab63822643e108f67da016aa800ea099",
+        "lastModified": 1747087599,
+        "narHash": "sha256-REOWyS5ootqlMQgZDsq+OuLaePaOxj5v61pfoPMCMQM=",
+        "ref": "buildbot",
+        "rev": "abf91b6f4b6ce0b84df7259ea912edd4e0939c9d",
         "shallow": true,
         "type": "git",
-        "url": "https://github.com/NixOS/nixpkgs"
+        "url": "https://github.com/qowoz/nixpkgs"
       },
       "original": {
-        "ref": "nixos-unstable-small",
+        "ref": "buildbot",
         "shallow": true,
         "type": "git",
-        "url": "https://github.com/NixOS/nixpkgs"
+        "url": "https://github.com/qowoz/nixpkgs"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 7e2d2e877..8202f306a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
   description = "A nixos module to make buildbot a proper Nix-CI.";
 
   inputs = {
-    nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-unstable-small";
+    nixpkgs.url = "git+https://github.com/qowoz/nixpkgs?shallow=1&ref=buildbot";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 

From 9d931d53e9c275b17c82526d2f29d6119b4a32e7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 13 May 2025 09:49:12 +1000
Subject: [PATCH 2/2] packages/buildbot: remove patch, included in 4.3

---
 nixosModules/master.nix |  6 +++---
 packages/buildbot.nix   | 11 +----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/nixosModules/master.nix b/nixosModules/master.nix
index 595d982c1..b164c64b9 100644
--- a/nixosModules/master.nix
+++ b/nixosModules/master.nix
@@ -648,10 +648,10 @@ in
 
     assertions = [
       {
-        assertion = lib.versionAtLeast packages.buildbot.version "4.0.0";
+        assertion = lib.versionAtLeast packages.buildbot.version "4.3.0";
         message = ''
-          `buildbot-nix` requires `buildbot` 4.0.0 or greater to function.
-          Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.0.0,
+          `buildbot-nix` requires `buildbot` 4.3.0 or greater to function.
+          Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.3.0,
           i.e. nixpkgs-unstable.
         '';
       }
diff --git a/packages/buildbot.nix b/packages/buildbot.nix
index 104728dbd..2926710db 100644
--- a/packages/buildbot.nix
+++ b/packages/buildbot.nix
@@ -1,10 +1 @@
-{ buildbot, fetchpatch }:
-buildbot.overrideAttrs (o: {
-  patches = o.patches ++ [
-    (fetchpatch {
-      name = "add-Build.skipBuildIf.patch";
-      url = "https://github.com/buildbot/buildbot/commit/f08eeef96e15c686a4f6ad52368ad08246314751.patch";
-      hash = "sha256-ACPYXMbjIfw02gsKwmDKIIZkGSxxLWCaW7ceEcgbtIU=";
-    })
-  ];
-})
+{ buildbot, fetchpatch }: buildbot