c05bf02a85
This bumps Gerrit to 3.10.0, and also introduces a new mechanism for building it that should hopefully have some more stable hashes than the previous bodgery. In this world, we only cache what we explicitly want to. There are some hooks implemented for `rules_java` and `rules_nodejs` (before version 6) that force use of local binaries; this means we can drop the use of the FHSUserEnv and use the java and nodejs binaries provided by nixpkgs instead. detzip is deleted; it hasn't been used in yonks. We also add https://gerrit-review.googlesource.com/c/gerrit/+/431977, which bumps the SSHd version so that we can have U2F-based SSH keys. Change-Id: Ie12a9a33bbb1e4bd96aa252580aca3b8bc4a1205 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11963 Reviewed-by: lukegb <lukegb@tvl.fyi> Autosubmit: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 216843cff4a8e41ad9887118751a412c1a22ce72 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 1/3] Syntax highlight nix
|
|
|
|
---
|
|
.../app/embed/diff/gr-syntax-layer/gr-syntax-layer-worker.ts | 1 +
|
|
resources/com/google/gerrit/server/mime/mime-types.properties | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/polygerrit-ui/app/embed/diff/gr-syntax-layer/gr-syntax-layer-worker.ts b/polygerrit-ui/app/embed/diff/gr-syntax-layer/gr-syntax-layer-worker.ts
|
|
index 50742903de..d1e89920cc 100644
|
|
--- a/polygerrit-ui/app/embed/diff/gr-syntax-layer/gr-syntax-layer-worker.ts
|
|
+++ b/polygerrit-ui/app/embed/diff/gr-syntax-layer/gr-syntax-layer-worker.ts
|
|
@@ -98,6 +98,7 @@ const LANGUAGE_MAP = new Map<string, string>([
|
|
['text/x-vhdl', 'vhdl'],
|
|
['text/x-yaml', 'yaml'],
|
|
['text/vbscript', 'vbscript'],
|
|
+ ['text/x-nix', 'nix'],
|
|
]);
|
|
|
|
const CLASS_PREFIX = 'gr-syntax gr-syntax-';
|
|
diff --git a/resources/com/google/gerrit/server/mime/mime-types.properties b/resources/com/google/gerrit/server/mime/mime-types.properties
|
|
index 642ef474a5..97f1ff835b 100644
|
|
--- a/resources/com/google/gerrit/server/mime/mime-types.properties
|
|
+++ b/resources/com/google/gerrit/server/mime/mime-types.properties
|
|
@@ -154,6 +154,7 @@ msgenny = text/x-msgenny
|
|
mts = application/typescript
|
|
nb = text/x-mathematica
|
|
nginx.conf = text/x-nginx-conf
|
|
+nix = text/x-nix
|
|
nsh = text/x-nsis
|
|
nsi = text/x-nsis
|
|
nt = text/n-triples
|
|
--
|
|
2.45.1
|
|
|