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

chore(3p/gerrit): 3.8.2 -> 3.9.1

Browse source 
Change-Id: I8fa10b52c44bd3d5efb0fff740ad6d5da6e96831
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10802
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Luke Granger-Brown 2024-02-11 04:39:37 +00:00 committed by lukegb
parent 0c6813ccf8
commit 28173ca4b9
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/modules/monorepo-gerrit.nix
View file

@ -42,7 +42,7 @@ in
# Gerrit. # Gerrit.
# #
# TODO(tazjin): Update Gerrit and remove this when possible. # TODO(tazjin): Update Gerrit and remove this when possible.
jvmPackage = pkgs.openjdk11_headless; jvmPackage = pkgs.openjdk17_headless;
settings = { settings = {
core.packedGitLimit = "100m"; core.packedGitLimit = "100m";

12
third_party/gerrit/default.nix vendored
View file

@ -11,7 +11,7 @@ let
name = "bazel"; name = "bazel";
targetPkgs = pkgs: [ targetPkgs = pkgs: [
(pkgs.bazel_5.override { enableNixHacks = true; }) (pkgs.bazel_5.override { enableNixHacks = true; })
pkgs.jdk11_headless pkgs.jdk17_headless
pkgs.zlib pkgs.zlib
pkgs.python3 pkgs.python3
pkgs.curl pkgs.curl
@ -23,7 +23,7 @@ let
runScript = "/bin/bazel-run"; runScript = "/bin/bazel-run";
}; };
bazel = bazelTop // { override = x: bazelTop; }; bazel = bazelTop // { override = x: bazelTop; };
version = "3.8.2"; version = "3.9.1";
in in
pkgs.lib.makeOverridable pkgs.buildBazelPackage { pkgs.lib.makeOverridable pkgs.buildBazelPackage {
pname = "gerrit"; pname = "gerrit";
@ -31,9 +31,9 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/gerrit"; url = "https://gerrit.googlesource.com/gerrit";
rev = "67500d39b5bceee8f3ae8b9d605f01428aacb740"; rev = "620a819cbf3c64fff7a66798822775ad42c91d8e";
branchName = "v${version}"; branchName = "v${version}";
sha256 = "sha256:06bmzbcb9717s4b016kcbn8nr9pgaz04i8bnzg7ybkbdwpl8vxvl"; sha256 = "sha256:1mdxbgnx3mpxand4wq96ic38bb4yh45q271h40jrk7dk23sgmz02";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -55,7 +55,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
fetchConfigured = true; fetchConfigured = true;
fetchAttrs = { fetchAttrs = {
sha256 = "sha256:1syy44n1nvrlypa8jv83yzf0miwmsn8bvh97js6v5ygllx04mvf1"; sha256 = "sha256:119mqli75c9fy05ddrlh2brjxb354yvv1ijjkk1y1yqcaqppwwb8";
preBuild = '' preBuild = ''
rm .bazelversion rm .bazelversion
''; '';
@ -80,7 +80,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
# Removing top-level symlinks along with their markers. # Removing top-level symlinks along with their markers.
# This is needed because they sometimes point to temporary paths (?). # This is needed because they sometimes point to temporary paths (?).
# For example, in Tensorflow-gpu build: # For example, in Tensorflow-gpu build:
# platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms #sha256:06bmzbcb9717s4b016kcbn8nr9pgaz04i8bnzg7ybkbdwpl8vxvv"; platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms
find $bazelOut/external -maxdepth 1 -type l | while read symlink; do find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
name="$(basename "$symlink")" name="$(basename "$symlink")"
rm -rf "$symlink" "$bazelOut/external/@$name.marker" rm -rf "$symlink" "$bazelOut/external/@$name.marker"

2
third_party/gerrit_plugins/code-owners/default.nix vendored
View file

@ -5,7 +5,7 @@ let
in in
buildGerritBazelPlugin rec { buildGerritBazelPlugin rec {
name = "code-owners"; name = "code-owners";
depsOutputHash = "sha256:1hd63b54zkgv8j7323inp7rdnhs2jdsb232jqlwsd9pai2f12m7n"; depsOutputHash = "sha256:0jv62cc1kpgsmwk119i9njmqn6w6k8frlbgcw87y8nfbpprmcf01";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/plugins/code-owners"; url = "https://gerrit.googlesource.com/plugins/code-owners";
rev = "e654ae5bda2085bce9a99942bec440e004a114f3"; rev = "e654ae5bda2085bce9a99942bec440e004a114f3";

6
third_party/gerrit_plugins/oauth/default.nix vendored
View file

@ -5,11 +5,11 @@ let
in in
buildGerritBazelPlugin rec { buildGerritBazelPlugin rec {
name = "oauth"; name = "oauth";
depsOutputHash = "sha256:16lv1glsfkn2bagx0vs6sgjf1mdd8vf3dl3iby1zvcm3wnrwfz7y"; depsOutputHash = "sha256:01z7rn8hnms3cp7mq27yk063lpy4pmqwpfrcc3cfl0r43k889zz3";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/plugins/oauth"; url = "https://gerrit.googlesource.com/plugins/oauth";
rev = "f9bef7476bc99f7b1dc3fe2d52ec95cd7ac571dc"; rev = "b27cf3ea820eec2ddd22d217fc839261692ccdb0";
sha256 = "08wf50bz7ash37mzlrxfy7hvmjsf6s4ncpcw5969hs9hjvjfj4dz"; sha256 = "1m654ibgzprrhcl0wpzqrmq8drpgx6rzlw0ha16l1fi2zv5idkk2";
}; };
overlayPluginCmd = '' overlayPluginCmd = ''
chmod +w "$out" "$out/plugins/external_plugin_deps.bzl" chmod +w "$out" "$out/plugins/external_plugin_deps.bzl"