From 79c9506eea638cd04ef2b0a87596cc388d13f41a Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 12 Aug 2021 15:35:37 +0300
Subject: [PATCH] fix(monorepo-gerrit): Pin JVM version used for Gerrit
Change-Id: Ib22cdc415cbd5a8345b9589b2c34b3908996dd57
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3322
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
ops/modules/monorepo-gerrit.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ops/modules/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix
index eaea386ec..b704ab153 100644
--- a/ops/modules/monorepo-gerrit.nix
+++ b/ops/modules/monorepo-gerrit.nix
@@ -27,6 +27,13 @@ in {
jvmHeapLimit = "4g";
+ # In some NixOS channel bump, the default version of OpenJDK has
+ # changed to one that is incompatible with our current version of
+ # Gerrit.
+ #
+ # TODO(tazjin): Update Gerrit and remove this when possible.
+ jvmPackage = pkgs.openjdk11_headless;
+
settings = {
core.packedGitLimit = "100m";
log.jsonLogging = true;