Skip to content

Commit ec2f3a9

Browse files
committed
move buildbot patch to package
1 parent 76cdaee commit ec2f3a9

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

nixosModules/packages.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,7 @@ in
1818

1919
buildbot = lib.mkOption {
2020
type = lib.types.package;
21-
default = pkgs.buildbot.overrideAttrs (o: {
22-
patches = o.patches ++ [
23-
(pkgs.fetchpatch {
24-
name = "add-Build.skipBuildIf.patch";
25-
url = "https://github.com/buildbot/buildbot/commit/f08eeef96e15c686a4f6ad52368ad08246314751.patch";
26-
hash = "sha256-ACPYXMbjIfw02gsKwmDKIIZkGSxxLWCaW7ceEcgbtIU=";
27-
})
28-
];
29-
});
21+
default = pkgs.callPackage ../packages/buildbot.nix { };
3022
};
3123

3224
buildbot-worker = lib.mkOption {

packages/buildbot.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
];
10+
})

packages/flake-module.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
packages =
1010
{
1111
# useful for checking what buildbot version is used.
12-
buildbot = pkgs.buildbot;
12+
buildbot = pkgs.callPackage ./buildbot.nix { };
1313
buildbot-nix = pkgs.python3.pkgs.callPackage ./buildbot-nix.nix { };
1414
buildbot-gitea = pkgs.python3.pkgs.callPackage ./buildbot-gitea.nix {
1515
buildbot = pkgs.buildbot;

0 commit comments

Comments
 (0)