From 173f2c8f76cd3359973456597d2dfff72e023c9b Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 1 Aug 2020 16:03:27 +0000
Subject: chore(gerrit): Update to latest HEAD.

Change-Id: I650777bbbd24a1922f26967fbbd7da06d14b6786
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1516
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
---
 third_party/gerrit/default.nix         | 9 ++++-----
 third_party/gerrit_plugins/default.nix | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'third_party')

diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix
index df43a9a2ac..84804db1e9 100644
--- a/third_party/gerrit/default.nix
+++ b/third_party/gerrit/default.nix
@@ -28,15 +28,15 @@ let
     runScript = "/bin/bazel-run";
   };
   bazel = bazelTop // { override = x: bazelTop; };
-  version = "3.2.2-1002-gea26b5ee7a";
+  version = "3.2.3-951-gd888625eb5";
 in
 pkgs.lib.makeOverridable pkgs.buildBazelPackage {
   name = "gerrit-${version}";
 
   src = pkgs.fetchgit {
     url = "https://gerrit.googlesource.com/gerrit";
-    rev = "ea26b5ee7a1c1e4042525d308678570101d4d4d6";
-    sha256 = "0w74sk61fc98ia1lqkqn97vhvyqr226x5bjxkw3251208mf173dd";
+    rev = "d888625eb5e1c91b257c9501924efdd9ae498422";
+    sha256 = "15dgjn5xqhvgwnc4klmh2m8f205x1fhchbs8x312lm2g2apdhdcc";
     fetchSubmodules = true;
   };
   patches = [
@@ -46,7 +46,6 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
     ./0004-Add-titles-to-CLs-over-HTTP.patch
     ./0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch
     ./0006-Always-use-Google-Fonts.patch
-    ./0007-Fix-gr-hovercard-behavior-under-Firefox.patch
   ];
 
   bazelTarget = "release";
@@ -59,7 +58,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
   removeRulesCC = false;
 
   fetchAttrs = {
-    sha256 = "0q0ia0h9iiggpb67v00vp80inn2gzi5ksf42a3m3nxfnvckw8zpa";
+    sha256 = "1f624gb1whmadf7qyv5l2yqw7pgbjlbfyk1gzkrcykhlwsxz9z0f";
     preBuild = ''
       rm .bazelversion
     '';
diff --git a/third_party/gerrit_plugins/default.nix b/third_party/gerrit_plugins/default.nix
index e010d4479c..98308310ac 100644
--- a/third_party/gerrit_plugins/default.nix
+++ b/third_party/gerrit_plugins/default.nix
@@ -7,7 +7,7 @@ in
   # https://gerrit.googlesource.com/plugins/owners
   owners = buildGerritBazelPlugin rec {
     name = "owners";
-    depsOutputHash = "0j60yn65kn27s7cjkj3z6irymq7j7rj3q5h3n6xfrs5inm4md2ad";
+    depsOutputHash = "1l99a1qa3bndk1cx4fsrq18z3p7rg6yp9r83snldp97kg25873cs";
     src = pkgs.fetchgit {
       url = "https://gerrit.googlesource.com/plugins/owners";
       rev = "17817c9e319073c03513f9d5177b6142b8fd567b";
@@ -26,11 +26,11 @@ in
   # https://gerrit.googlesource.com/plugins/checks
   checks = buildGerritBazelPlugin {
     name = "checks";
-    depsOutputHash = "1nk63ahlynqn5my7lzy7vsax07n585ndmvbnz2xbwkppl1m7j56l";
+    depsOutputHash = "0igixhkgvd8d51swbypsby553sdzghlj4b9wy9cnf2d8d0aqs2ky";
     src = pkgs.fetchgit {
       url = "https://gerrit.googlesource.com/plugins/checks";
-      rev = "36d9e5c61b95ade98883ded5eb1e168c28ef99bf";
-      sha256 = "03abn4m9x8cinx86c41hrazg0kgwvjfak3w155sca1ikq4605pma";
+      rev = "f508353fc5f93d35d07279857aba5d9cf38de658";
+      sha256 = "094j225cpgckxvnqzk3rif34iylgr0r7v4n6r1m1qymavbk9wg9j";
       deepClone = true;
       leaveDotGit = true;
     };
-- 
cgit 1.4.1