Merge pull request #436 from nix-community/buildbot43

buildbot 4.3

Author: zowoq

buildbot_nix/buildbot_nix/repo_config/__init__.py

@@ -28,7 +28,7 @@ async def extract_during_step(cls, buildstep: BuildStepShellMixin) -> Self:
         cmd = await buildstep.makeRemoteShellCommand(
             collectStdout=True,
             collectStderr=True,
-            stdioLogName=None,
+            stdioLogName=None,  # type: ignore[arg-type]
             # TODO: replace this with something like buildbot.steps.transfer.StringUpload
             # in the future... this one doesn't not exist yet.
             command=[

flake.lock

@@ -678,10 +678,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.
         '';
       }

nixosModules/master.nix

@@ -1,15 +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=";
-    })
-    (fetchpatch {
-      name = "fix-deprecation-warnings.patch";
-      url = "https://github.com/buildbot/buildbot/commit/a894300c5085be925f5021bae2058492625a786b.patch";
-      hash = "sha256-agxubz/5PSw4WL3/d63GVnTKy67mLmL9pbVeImvbrYA=";
-    })
-  ];
-})
+{ buildbot, fetchpatch }: buildbot