From bbfcc7bbf054e1bf8fa8b3cfb3919ea7a2a76115 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 20 Dec 2020 15:08:08 +0000 Subject: chore(3p/gerrit): bump to latest version deployed on gerrit-review Change-Id: I0aee39b21346f378964bab69bd903e8f43b7e7e8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2265 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch | 2 +- third_party/gerrit/0002-Syntax-highlight-nix.patch | 2 +- third_party/gerrit/0003-Syntax-highlight-rules.pl.patch | 2 +- third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch | 4 ++-- ...005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch | 2 +- third_party/gerrit/0006-Always-use-Google-Fonts.patch | 2 +- third_party/gerrit/default.nix | 6 +++--- third_party/gerrit_plugins/default.nix | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'third_party') diff --git a/third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch b/third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch index 62d830c4d1db..3fabbd8294ec 100644 --- a/third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch +++ b/third_party/gerrit/0001-Use-detzip-in-download_bower.py.patch @@ -1,4 +1,4 @@ -From b8e1242655d308377f28c9bfcca2fe578e7093bb Mon Sep 17 00:00:00 2001 +From 9467d1138799d0fc127f9e1e09cf2afd9b85de79 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 2 Jul 2020 23:02:09 +0100 Subject: [PATCH 1/6] Use detzip in download_bower.py diff --git a/third_party/gerrit/0002-Syntax-highlight-nix.patch b/third_party/gerrit/0002-Syntax-highlight-nix.patch index a87529d8c84a..98d09405af60 100644 --- a/third_party/gerrit/0002-Syntax-highlight-nix.patch +++ b/third_party/gerrit/0002-Syntax-highlight-nix.patch @@ -1,4 +1,4 @@ -From 18a008f8bddfa529296357620bbd9a97de6b2879 Mon Sep 17 00:00:00 2001 +From 27575eba5e812c4e86aa35f32e2958758312cf87 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 2 Jul 2020 23:02:32 +0100 Subject: [PATCH 2/6] Syntax highlight nix diff --git a/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch b/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch index a3165444237c..f77f5c8f6aa5 100644 --- a/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch +++ b/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch @@ -1,4 +1,4 @@ -From 9358b1cdd5f13e6638030446880f731785ca38f1 Mon Sep 17 00:00:00 2001 +From a76aba976de1a1e46c5aeb8772f3f2d58c7efda4 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 2 Jul 2020 23:02:43 +0100 Subject: [PATCH 3/6] Syntax highlight rules.pl diff --git a/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch b/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch index b1ac119927ed..a6395b5444fc 100644 --- a/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch +++ b/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch @@ -1,4 +1,4 @@ -From ad4564c31401a900702fca6e3f673badbfbdf9d9 Mon Sep 17 00:00:00 2001 +From 97c5e78c42fe70e3f9cd9bc37129700067525967 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 2 Jul 2020 23:03:02 +0100 Subject: [PATCH 4/6] Add titles to CLs over HTTP @@ -192,7 +192,7 @@ index 0000000000..8fd2053ad0 + } +} diff --git a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy -index 000f4e2b5f..fcc26f7f54 100644 +index 31ea7d2175..abadd089b4 100644 --- a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy +++ b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy @@ -33,10 +33,12 @@ diff --git a/third_party/gerrit/0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch b/third_party/gerrit/0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch index 03b24b84faca..a9fb2f042b22 100644 --- a/third_party/gerrit/0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch +++ b/third_party/gerrit/0005-When-using-local-fonts-always-assume-Gerrit-is-mount.patch @@ -1,4 +1,4 @@ -From dfa0d782edb6b2d789f71a2462ba93e6101b5e4e Mon Sep 17 00:00:00 2001 +From f73b313cfeb94005136d55098460f51b17ff6556 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Jul 2020 00:45:57 +0000 Subject: [PATCH 5/6] When using local fonts, always assume Gerrit is mounted diff --git a/third_party/gerrit/0006-Always-use-Google-Fonts.patch b/third_party/gerrit/0006-Always-use-Google-Fonts.patch index 1b392053537f..5263ce114785 100644 --- a/third_party/gerrit/0006-Always-use-Google-Fonts.patch +++ b/third_party/gerrit/0006-Always-use-Google-Fonts.patch @@ -1,4 +1,4 @@ -From def99cd67963afad42bd70f21fd2f626603481e4 Mon Sep 17 00:00:00 2001 +From 1705c2634a2271659e3baf6b6c35f2e63bf05736 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Jul 2020 00:46:13 +0000 Subject: [PATCH 6/6] Always use Google Fonts. diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix index 8879616310e3..22a937560d93 100644 --- a/third_party/gerrit/default.nix +++ b/third_party/gerrit/default.nix @@ -36,8 +36,8 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage { src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/gerrit"; - rev = "d36cf01b0f03eb6a555c915cc9d570e4b07d485b"; - sha256 = "sha256:0a8qnwyhkl8amp34qlnym50787iaxg34k0f44dsyj6qlkj6aqx57"; + rev = "595e6db974449ff278709f5e87cd8d42199305fc"; + sha256 = "sha256:17mad9k41rvnzq91nr9w2lax6rdk7pgf20qc4chajay99faimhph"; fetchSubmodules = true; }; patches = [ @@ -60,7 +60,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage { fetchConfigured = true; fetchAttrs = { - sha256 = "sha256:042m2fzp6hhc76hiyvjakx2bcpbwsbf8gv20d6zifi237dgw6pj3"; + sha256 = "sha256:16vm9kk7hqbk80y2frxv6yirhzn4aiyak5i7dxypbkvvqj880c7b"; preBuild = '' rm .bazelversion ''; diff --git a/third_party/gerrit_plugins/default.nix b/third_party/gerrit_plugins/default.nix index 40c79ddbbd0a..1fb3377d3f0c 100644 --- a/third_party/gerrit_plugins/default.nix +++ b/third_party/gerrit_plugins/default.nix @@ -7,11 +7,11 @@ in # https://gerrit.googlesource.com/plugins/owners owners = buildGerritBazelPlugin rec { name = "owners"; - depsOutputHash = "sha256:1liya9ayk6wv7yc0fpv0vyx7pnvnxirxnsxybs4akgbmrss5ahs2"; + depsOutputHash = "sha256:14h39q37lg9bydjqnhr52jakqvrx97jfqfg03l35qyadw780pny2"; src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/plugins/owners"; rev = "17817c9e319073c03513f9d5177b6142b8fd567b"; - sha256 = "1p089shybp50svckcq51d0hfisjvbggndmvmhh8pvzvi6w8n9d89"; + sha256 = "sha256:0gz9kqi32qnmhxc4r5fyrywfj3pfifiirk8l49f30m9rzhd9yrmy"; deepClone = true; leaveDotGit = true; }; @@ -26,11 +26,11 @@ in # https://gerrit.googlesource.com/plugins/checks checks = buildGerritBazelPlugin { name = "checks"; - depsOutputHash = "sha256:12yg72w7kndz5ag7cgdzhxdpv8hy3qln71n93226iswwkn22c2sw"; + depsOutputHash = "sha256:1y1mfnznqrm73vf97ilzn7vjy3fcfqnz9jxgp6h5584k9adnb6zl"; src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/plugins/checks"; rev = "ab49a63f5c159bda42d9ad1bdb9286bede6c5de4"; - sha256 = "sha256:0v16hrpfppi4hi2l2133m56fknbvc3nas1h1a1x48gdgm8d4g27f"; + sha256 = "sha256:1czsvdz50r2c53vyz65if5ddm3i32zxi448irj94hc1bxmygdqbc"; deepClone = true; leaveDotGit = true; }; -- cgit 1.4.1