diff options
7 files changed, 22 insertions, 20 deletions
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 30dfd4fffac5..c120667a6094 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 6884c9e2aacc33fb12db926c6d6b3737b9aa67b1 Mon Sep 17 00:00:00 2001 +From c88d8c133d2f50451c7fb73592db4a000b87f15f 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/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 9dd71fbcf59a..9df29ab07b46 100644 --- a/third_party/gerrit/0002-Syntax-highlight-nix.patch +++ b/third_party/gerrit/0002-Syntax-highlight-nix.patch @@ -1,4 +1,4 @@ -From 0da464ae9982b279fe3ca4c4ec6a361ae9fded24 Mon Sep 17 00:00:00 2001 +From 1310ad5e56248bf216774cd13e828ba76e0c6f65 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/6] Syntax highlight nix @@ -8,10 +8,10 @@ Subject: [PATCH 2/6] Syntax highlight nix 1 file changed, 1 insertion(+) diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js -index f1e930f177..cc937cff67 100644 +index 6399c4a469..480d2946c3 100644 --- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js +++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js -@@ -101,6 +101,7 @@ const LANGUAGE_MAP = { +@@ -99,6 +99,7 @@ const LANGUAGE_MAP = { 'text/x-vhdl': 'vhdl', 'text/x-yaml': 'yaml', 'text/vbscript': 'vbscript', diff --git a/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch b/third_party/gerrit/0003-Syntax-highlight-rules.pl.patch index c458223dcfc8..a1c43a048521 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 ec8d9361d081070202a4b54035209077022dfca6 Mon Sep 17 00:00:00 2001 +From a8dad8e63a1be32f473e96c6c7530a70d368369f 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/6] Syntax highlight rules.pl @@ -8,10 +8,10 @@ Subject: [PATCH 3/6] Syntax highlight rules.pl 1 file changed, 10 insertions(+) diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js -index cc937cff67..2145bc169b 100644 +index 480d2946c3..b2020c24bd 100644 --- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js +++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js -@@ -105,6 +105,10 @@ const LANGUAGE_MAP = { +@@ -103,6 +103,10 @@ const LANGUAGE_MAP = { }; const ASYNC_DELAY = 10; @@ -19,10 +19,10 @@ index cc937cff67..2145bc169b 100644 + 'rules.pl': 'prolog', +}; + - const CLASS_WHITELIST = { + const CLASS_SAFELIST = { 'gr-diff gr-syntax gr-syntax-attr': true, 'gr-diff gr-syntax gr-syntax-attribute': true, -@@ -236,10 +240,16 @@ class GrSyntaxLayer extends GestureEventListeners( +@@ -234,10 +238,16 @@ class GrSyntaxLayer extends GestureEventListeners( } } 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 e9c4e006977c..d6f5e8c9fa5f 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 ec764594563ede6d8bfffca0c9593f29ae80fc88 Mon Sep 17 00:00:00 2001 +From 61035d1e81884390708675ab994e0e7210659883 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/6] Add titles to CLs over HTTP @@ -195,7 +195,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 d162714399..0ba228ad00 100644 +index 32ba0bc790..2515c71d6a 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 742411a575e6..a1666c055947 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 f3e91155c990ee7e329be8ad799e5bddfc26434e Mon Sep 17 00:00:00 2001 +From 73edc92dfa584117f6a4373388c9bc47e50a5713 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Sat, 11 Jul 2020 00:45:57 +0000 Subject: [PATCH 5/6] When using local fonts, always assume Gerrit is mounted @@ -9,7 +9,7 @@ Subject: [PATCH 5/6] When using local fonts, always assume Gerrit is mounted 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polygerrit-ui/app/rollup.config.js b/polygerrit-ui/app/rollup.config.js -index d83f24fb25..adf573c1ab 100644 +index db0e2f7159..7bde541405 100644 --- a/polygerrit-ui/app/rollup.config.js +++ b/polygerrit-ui/app/rollup.config.js @@ -50,7 +50,7 @@ const importLocalFontMetaUrlResolver = function() { diff --git a/third_party/gerrit/0006-Always-use-Google-Fonts.patch b/third_party/gerrit/0006-Always-use-Google-Fonts.patch index 5f6e8eb0ec61..597e44604f81 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 3b757716417b1b8d5326e952133d986ec160a048 Mon Sep 17 00:00:00 2001 +From f3b85ab3ac139d8ec51c09aa5e0d430d65e35a96 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> 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 620ccd259ab3..8893f46cdeab 100644 --- a/third_party/gerrit/default.nix +++ b/third_party/gerrit/default.nix @@ -28,17 +28,19 @@ let runScript = "/bin/bazel-run"; }; bazel = bazelTop // { override = x: bazelTop; }; - version = "3.2.2"; + version = "3.2.2-1002-gea26b5ee7a"; in pkgs.buildBazelPackage { name = "gerrit-${version}"; - src = pkgs.fetchgit { + src = (pkgs.fetchgit { url = "https://gerrit.googlesource.com/gerrit"; - rev = "v${version}"; - sha256 = "1kyzf1bzl0mws774pjk56wlfp9v8bdh5x0irm7n7ifab3s1ccdkw"; + rev = "ea26b5ee7a1c1e4042525d308678570101d4d4d6"; + sha256 = "1bndmk7namb81zkscmpvf8ygwrj0wh842xbj0irgbm5w2xwdzkch"; fetchSubmodules = true; - }; + deepClone = true; + leaveDotGit = true; + }); patches = [ ./0001-Use-detzip-in-download_bower.py.patch ./0002-Syntax-highlight-nix.patch @@ -58,7 +60,7 @@ pkgs.buildBazelPackage { removeRulesCC = false; fetchAttrs = { - sha256 = "18cglkmfi1nwcs8n0j62bkh8l9bcgp1g52ackbzs57v70cg93nq7"; + sha256 = "0jhvcpzkpcanxm99grgk6giv8yf2j0zix5z91wbnz6hb0isps5hs"; preBuild = '' rm .bazelversion ''; |