mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(gerrit): Update to latest HEAD.

Browse source 
Change-Id: I650777bbbd24a1922f26967fbbd7da06d14b6786
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1516
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Luke Granger-Brown 2020-08-01 16:03:27 +00:00 committed by lukegb
parent d2eff4153d
commit 173f2c8f76
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
third_party/gerrit/default.nix vendored
View file

@ -28,15 +28,15 @@ let
runScript = "/bin/bazel-run"; runScript = "/bin/bazel-run";
}; };
bazel = bazelTop // { override = x: bazelTop; }; bazel = bazelTop // { override = x: bazelTop; };
version = "3.2.2-1002-gea26b5ee7a"; version = "3.2.3-951-gd888625eb5";
in in
pkgs.lib.makeOverridable pkgs.buildBazelPackage { pkgs.lib.makeOverridable pkgs.buildBazelPackage {
name = "gerrit-${version}"; name = "gerrit-${version}";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/gerrit"; url = "https://gerrit.googlesource.com/gerrit";
rev = "ea26b5ee7a1c1e4042525d308678570101d4d4d6"; rev = "d888625eb5e1c91b257c9501924efdd9ae498422";
sha256 = "0w74sk61fc98ia1lqkqn97vhvyqr226x5bjxkw3251208mf173dd"; sha256 = "15dgjn5xqhvgwnc4klmh2m8f205x1fhchbs8x312lm2g2apdhdcc";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
@ -46,7 +46,6 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
./0004-Add-titles-to-CLs-over-HTTP.patch ./0004-Add-titles-to-CLs-over-HTTP.patch
./0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch ./0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch
./0006-Always-use-Google-Fonts.patch ./0006-Always-use-Google-Fonts.patch
./0007-Fix-gr-hovercard-behavior-under-Firefox.patch
]; ];
bazelTarget = "release"; bazelTarget = "release";
@ -59,7 +58,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
removeRulesCC = false; removeRulesCC = false;
fetchAttrs = { fetchAttrs = {
sha256 = "0q0ia0h9iiggpb67v00vp80inn2gzi5ksf42a3m3nxfnvckw8zpa"; sha256 = "1f624gb1whmadf7qyv5l2yqw7pgbjlbfyk1gzkrcykhlwsxz9z0f";
preBuild = '' preBuild = ''
rm .bazelversion rm .bazelversion
''; '';

8
third_party/gerrit_plugins/default.nix vendored
View file

@ -7,7 +7,7 @@ in
# https://gerrit.googlesource.com/plugins/owners # https://gerrit.googlesource.com/plugins/owners
owners = buildGerritBazelPlugin rec { owners = buildGerritBazelPlugin rec {
name = "owners"; name = "owners";
depsOutputHash = "0j60yn65kn27s7cjkj3z6irymq7j7rj3q5h3n6xfrs5inm4md2ad"; depsOutputHash = "1l99a1qa3bndk1cx4fsrq18z3p7rg6yp9r83snldp97kg25873cs";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/plugins/owners"; url = "https://gerrit.googlesource.com/plugins/owners";
rev = "17817c9e319073c03513f9d5177b6142b8fd567b"; rev = "17817c9e319073c03513f9d5177b6142b8fd567b";
@ -26,11 +26,11 @@ in
# https://gerrit.googlesource.com/plugins/checks # https://gerrit.googlesource.com/plugins/checks
checks = buildGerritBazelPlugin { checks = buildGerritBazelPlugin {
name = "checks"; name = "checks";
depsOutputHash = "1nk63ahlynqn5my7lzy7vsax07n585ndmvbnz2xbwkppl1m7j56l"; depsOutputHash = "0igixhkgvd8d51swbypsby553sdzghlj4b9wy9cnf2d8d0aqs2ky";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/plugins/checks"; url = "https://gerrit.googlesource.com/plugins/checks";
rev = "36d9e5c61b95ade98883ded5eb1e168c28ef99bf"; rev = "f508353fc5f93d35d07279857aba5d9cf38de658";
sha256 = "03abn4m9x8cinx86c41hrazg0kgwvjfak3w155sca1ikq4605pma"; sha256 = "094j225cpgckxvnqzk3rif34iylgr0r7v4n6r1m1qymavbk9wg9j";
deepClone = true; deepClone = true;
leaveDotGit = true; leaveDotGit = true;
}; };