Skip to content

Commit 10d9343

Browse files
committed
packages/buildbot: remove patches, included in 4.3
1 parent 4aa9590 commit 10d9343

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

nixosModules/master.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ in
678678

679679
assertions = [
680680
{
681-
assertion = lib.versionAtLeast packages.buildbot.version "4.0.0";
681+
assertion = lib.versionAtLeast packages.buildbot.version "4.3.0";
682682
message = ''
683-
`buildbot-nix` requires `buildbot` 4.0.0 or greater to function.
684-
Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.0.0,
683+
`buildbot-nix` requires `buildbot` 4.3.0 or greater to function.
684+
Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.3.0,
685685
i.e. nixpkgs-unstable.
686686
'';
687687
}

packages/buildbot.nix

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
{ buildbot, fetchpatch }:
2-
buildbot.overrideAttrs (o: {
3-
patches = o.patches ++ [
4-
(fetchpatch {
5-
name = "add-Build.skipBuildIf.patch";
6-
url = "https://github.com/buildbot/buildbot/commit/f08eeef96e15c686a4f6ad52368ad08246314751.patch";
7-
hash = "sha256-ACPYXMbjIfw02gsKwmDKIIZkGSxxLWCaW7ceEcgbtIU=";
8-
})
9-
(fetchpatch {
10-
name = "fix-deprecation-warnings.patch";
11-
url = "https://github.com/buildbot/buildbot/commit/a894300c5085be925f5021bae2058492625a786b.patch";
12-
hash = "sha256-agxubz/5PSw4WL3/d63GVnTKy67mLmL9pbVeImvbrYA=";
13-
})
14-
];
15-
})
1+
{ buildbot, fetchpatch }: buildbot

0 commit comments

Comments
 (0)