packages/buildbot: remove patch, included in 4.3

zowoq · zowoq · commit 9d931d53e9c2 · 2025-05-14T19:24:28.000+10:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -648,10 +648,10 @@ in`
`648`	`648`
`649`	`649`	`assertions = [`
`650`	`650`	`{`
`651`		`- assertion = lib.versionAtLeast packages.buildbot.version "4.0.0";`
	`651`	`+ assertion = lib.versionAtLeast packages.buildbot.version "4.3.0";`
`652`	`652`	`message = ''`
`653`		- `buildbot-nix` requires `buildbot` 4.0.0 or greater to function.
`654`		`- Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.0.0,`
	`653`	+ `buildbot-nix` requires `buildbot` 4.3.0 or greater to function.
	`654`	`+ Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.3.0,`
`655`	`655`	`i.e. nixpkgs-unstable.`
`656`	`656`	`'';`
`657`	`657`	`}`