From 70b4eadb5f257d94b2f5f8dbaaf712f1a5c962c7 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 15 Oct 2023 00:43:44 +0000
Subject: chore(3p/gerrit): 3.7.0-rc4 -> 3.8.2

Bump gerrit plugins dep hashes, and for code-owners rebase it against
master.

Change-Id: If7da0ca391b4a5c0102560ca8d52b6f5a2dfd223
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9734
Autosubmit: lukegb <lukegb@tvl.fyi>
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
---
 third_party/gerrit/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'third_party/gerrit')

diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix
index b228e600fd..ef3e628a1e 100644
--- a/third_party/gerrit/default.nix
+++ b/third_party/gerrit/default.nix
@@ -23,7 +23,7 @@ let
     runScript = "/bin/bazel-run";
   };
   bazel = bazelTop // { override = x: bazelTop; };
-  version = "3.7.0-rc4";
+  version = "3.8.2";
 in
 pkgs.lib.makeOverridable pkgs.buildBazelPackage {
   pname = "gerrit";
@@ -31,9 +31,9 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
 
   src = pkgs.fetchgit {
     url = "https://gerrit.googlesource.com/gerrit";
-    rev = "3e445c7833c4acf49f1171fe4c82ceb32e93c780";
+    rev = "67500d39b5bceee8f3ae8b9d605f01428aacb740";
     branchName = "v${version}";
-    sha256 = "sha256:002aw2bfifyla66v8khyiq4m9qj6ahs6r1dzb5kjk8xqpf6c6q9p";
+    sha256 = "sha256:06bmzbcb9717s4b016kcbn8nr9pgaz04i8bnzg7ybkbdwpl8vxvl";
     fetchSubmodules = true;
   };
 
@@ -55,7 +55,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
   fetchConfigured = true;
 
   fetchAttrs = {
-    sha256 = "sha256:1a31bkl723dyd906h0m54j2mnvgs82j3xr85ca07g35vncmh3lm2";
+    sha256 = "sha256:1syy44n1nvrlypa8jv83yzf0miwmsn8bvh97js6v5ygllx04mvf1";
     preBuild = ''
       rm .bazelversion
     '';
@@ -97,7 +97,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
 
       # Gerrit fixups:
       # Normalize permissions on .yarn-{tarball,metadata} files
-      find $bazelOut/external/yarn_cache \( -name .yarn-tarball.tgz -or -name .yarn-metadata.json \) -exec chmod 644 {} +
+      test -d $bazelOut/external/yarn_cache && find $bazelOut/external/yarn_cache \( -name .yarn-tarball.tgz -or -name .yarn-metadata.json \) -exec chmod 644 {} +
 
       mkdir $bazelOut/_bits/
       find . -name node_modules -prune -print | while read d; do
@@ -116,7 +116,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
     preConfigure = ''
       rm .bazelversion
 
-      cp -R $bazelOut/_bits/* ./
+      [ "$(ls -A $bazelOut/_bits)" ] && cp -R $bazelOut/_bits/* ./ || true
     '';
     postPatch = ''
       # Disable all errorprone checks, since we might be using a different version.
-- 
cgit 1.4.1