feat(3p/gerrit): Upgrade Gerrit and plugins to v3.4.0

Brings us back to a stable version of Gerrit instead of a random
commit. Note that Gerrit 3.4.1 is out, but due to a bug it can not be
built publicly because it accidentally points at a private
submodule (this is being fixed upstream).

Change-Id: I0376c63a649498cef999dfa99bfccba511f2c8da
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3444
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
This commit is contained in:
Vincent Ambo 2021-08-28 14:31:58 +03:00 committed by tazjin
parent 0c1b8f954e
commit fe225d48a1
11 changed files with 31 additions and 252 deletions

View file

@ -28,7 +28,7 @@ let
runScript = "/bin/bazel-run";
};
bazel = bazelTop // { override = x: bazelTop; };
version = "3.3.2-1990-gabb30fe7f1";
version = "3.4.0";
in
pkgs.lib.makeOverridable pkgs.buildBazelPackage {
pname = "gerrit";
@ -36,10 +36,12 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/gerrit";
rev = "abb30fe7f1ecf07d7b5098d6ad7e4423389c41e5";
sha256 = "sha256:0xsxhqyjl2dd1wglfk43b8c7591l2x5ikb4l7nxi96czladqy82v";
rev = "471c1c15a7bc294d10e246df43812942b5ac8a13";
branchName = "v${version}";
sha256 = "sha256:0ayj0bcsxjln8qydkj9j7yiqibmjgd3bcpqvgsdzdx072wzx01c0";
fetchSubmodules = true;
};
patches = [
./0001-Use-detzip-in-download_bower.py.patch
./0002-Syntax-highlight-nix.patch
@ -48,8 +50,6 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
./0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch
./0006-Always-use-Google-Fonts.patch
./0007-Keep-left-padding-on-account-chip-if-no-avatar-provi.patch
./polygerrit-revert-typescript.patch
];
bazelTarget = "release api-skip-javadoc";
@ -63,7 +63,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
fetchConfigured = true;
fetchAttrs = {
sha256 = "sha256:0i40brj8c49920fhl7h84rlbg1i4bz5c0p7sflm7h9m5m6jr8a1y";
sha256 = "sha256:16a1lbz40bc7217ldwf7x8yzlzxc714h965ldjnmfbvi3jq3hk6y";
preBuild = ''
rm .bazelversion
'';