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

chore(gerrit): update to 3.2.2

Browse source 
Change-Id: Ia41e19250f9f900c73904553a931f0f4dde3a5bf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/860
Tested-by: BuildkiteCI
Reviewed-by: Kane York <rikingcoding@gmail.com>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: isomer <isomer@tvl.fyi>
This commit is contained in:
Luke Granger-Brown 2020-07-02 23:35:30 +01:00 committed by lukegb
parent b485203b8c
commit 021d688ccc
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch vendored
View file

@ -1,4 +1,4 @@
From aa4cda172a61eb4f09759cba98f4645fe74753a9 Mon Sep 17 00:00:00 2001
From d0ae1a93f6e3cc91fe066a48fa4b8911d15bfc4c Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:02:09 +0100
Subject: [PATCH 1/4] Use detzip in download_bower.py

2
third_party/gerrit/0002-Syntax-highlight-nix.patch vendored
View file

@ -1,4 +1,4 @@
From f14cba31f2a9a75d06e58fd6313cc60d0cf5e690 Mon Sep 17 00:00:00 2001
From 1b869d045cbb557ed5475be1131282fa8e4afc76 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:02:32 +0100
Subject: [PATCH 2/4] Syntax highlight nix

2
third_party/gerrit/0003-Syntax-highlight-rules.pl.patch vendored
View file

@ -1,4 +1,4 @@
From c3603950e5ae377514febbebf9aa26c31e07cd5d Mon Sep 17 00:00:00 2001
From 0e4599e43c0f57c7636af3b8b384c212e1700351 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:02:43 +0100
Subject: [PATCH 3/4] Syntax highlight rules.pl

6
third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch vendored
View file

@ -1,4 +1,4 @@
From ead56bd63491ba4fd3c24fb1e9af36a3fa2141bf Mon Sep 17 00:00:00 2001
From a908a0e96a74300784416b5e3ff4cb2493b521ee Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:03:02 +0100
Subject: [PATCH 4/4] Add titles to CLs over HTTP
@ -13,7 +13,7 @@ Subject: [PATCH 4/4] Add titles to CLs over HTTP
create mode 100644 java/com/google/gerrit/httpd/raw/TitleComputer.java
diff --git a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
index 41d2f83975..323567b4a4 100644
index cddaea4aaf..d5f43de025 100644
--- a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
+++ b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
@@ -42,6 +42,7 @@ import java.util.Arrays;
@ -54,7 +54,7 @@ index 41d2f83975..323567b4a4 100644
throws RestApiException {
ImmutableMap.Builder<String, Object> data = ImmutableMap.builder();
Map<String, SanitizedContent> initialData = new HashMap<>();
@@ -159,6 +163,10 @@ public class IndexHtmlUtil {
@@ -158,6 +162,10 @@ public class IndexHtmlUtil {
}
data.put("gerritInitialData", initialData);

4
third_party/gerrit/default.nix vendored
View file

@ -28,7 +28,7 @@ let
runScript = "/bin/bazel-run";
};
bazel = bazelTop // { override = x: bazelTop; };
version = "3.2.1";
version = "3.2.2";
in
pkgs.buildBazelPackage {
name = "gerrit-${version}";
@ -36,7 +36,7 @@ pkgs.buildBazelPackage {
src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/gerrit";
rev = "v${version}";
sha256 = "1xrckiqc2l07dib22rn6iicgvph8iyxjrzr15bs5x6jdg9cic1s8";
sha256 = "1kyzf1bzl0mws774pjk56wlfp9v8bdh5x0irm7n7ifab3s1ccdkw";
fetchSubmodules = true;
};
patches = [