Skip to content

Commit 8b8ae66

Browse files
committed
buildbot-gitea: switch to fork
we had enough patches and upstream doesn't merge things.
1 parent 16956e2 commit 8b8ae66

6 files changed

+29
-124
lines changed

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@
103103
# useful for checking what buildbot version is used.
104104
buildbot = pkgs.buildbot;
105105
buildbot-nix = pkgs.python3.pkgs.callPackage ./nix/buildbot-nix.nix { };
106+
buildbot-gitea = pkgs.python3.pkgs.callPackage ./nix/buildbot-gitea.nix {
107+
buildbot = pkgs.buildbot;
108+
};
106109
}
107110
// lib.optionalAttrs pkgs.stdenv.isLinux {
108111
buildbot-effects = pkgs.python3.pkgs.callPackage ./nix/buildbot-effects.nix { };

nix/0001-GiteaHandler-set-the-category-of-PR-changes-to-pull-.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

nix/0001-reporter-create-status-in-the-base-repository-of-a-p.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.

nix/0002-GiteaHandler-set-branch-to-the-PR-branch-not-the-bas.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

nix/buildbot-gitea.nix

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
{
22
buildPythonPackage,
3-
fetchPypi,
3+
fetchFromGitHub,
44
lib,
5-
65
pip,
76
buildbot,
87
requests,
98
}:
10-
buildPythonPackage (
11-
lib.fix (self: {
12-
pname = "buildbot-gitea";
13-
version = "1.8.0";
9+
buildPythonPackage {
10+
pname = "buildbot-gitea";
11+
version = "1.8.0";
1412

15-
propagatedBuildInputs = [
16-
pip
17-
buildbot
18-
requests
19-
];
13+
src = fetchFromGitHub {
14+
owner = "Mic92";
15+
repo = "buildbot-gitea";
16+
rev = "a8e06d38f6654421aab787da04128756ce04a3df";
17+
hash = "sha256-z0Mj/PmTghziXJ6dV6qYFGZUuV0abMxzU+miqohDazU=";
18+
};
2019

21-
patches = [ ./0001-reporter-create-status-in-the-base-repository-of-a-p.patch ];
20+
propagatedBuildInputs = [
21+
pip
22+
buildbot
23+
requests
24+
];
2225

23-
src = fetchPypi {
24-
inherit (self) pname version;
25-
hash = "sha256-zYcILPp42QuQyfEIzmYKV9vWf47sBAQI8FOKJlZ60yA=";
26-
};
27-
})
28-
)
26+
meta = with lib; {
27+
description = "Gitea plugin for Buildbot";
28+
homepage = "https://github.com/Mic92/buildbot-gitea";
29+
license = licenses.mit;
30+
maintainers = with maintainers; [ mic92 ];
31+
};
32+
}

nix/packages.nix

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,11 @@ in
4141
};
4242

4343
buildbot-gitea = lib.mkOption {
44-
default =
45-
(cfg.python.pkgs.callPackage ./buildbot-gitea.nix {
44+
default = (
45+
cfg.python.pkgs.callPackage ./buildbot-gitea.nix {
4646
buildbot = cfg.buildbot;
47-
}).overrideAttrs
48-
(old: {
49-
patches = old.patches ++ [
50-
./0002-GiteaHandler-set-branch-to-the-PR-branch-not-the-bas.patch
51-
./0001-GiteaHandler-set-the-category-of-PR-changes-to-pull-.patch
52-
];
53-
});
47+
}
48+
);
5449
};
5550
};
5651
}

0 commit comments

Comments
 (0)