about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-06-14T17·58+0100
committertazjin <mail@tazj.in>2020-06-14T18·50+0000
commita4b3f9af9364d6e39a0f93ddbb5135dbff056b09 (patch)
treedad402684d99373a552bcd36227f154c410789fd
parent158d20c128cafc412dae9af1b1ac736d5c7af9d8 (diff)
fix(3p/gerrit): Fix Gerrit derivation name and module configuration r/955
Without these changes, the NixOS module isn't able to use the new
Gerrit derivation.

These changes are already deployed as I needed to make them to get
Gerrit back up.

Change-Id: Iad3aa6158789a014134fddccd40b508b81486100
Reviewed-on: https://cl.tvl.fyi/c/depot/+/301
Reviewed-by: lukegb <lukegb@tvl.fyi>
-rw-r--r--ops/nixos/monorepo-gerrit.nix2
-rw-r--r--third_party/gerrit/default.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/ops/nixos/monorepo-gerrit.nix b/ops/nixos/monorepo-gerrit.nix
index 58fbb8d206ac..add4b18c7dbb 100644
--- a/ops/nixos/monorepo-gerrit.nix
+++ b/ops/nixos/monorepo-gerrit.nix
@@ -22,6 +22,8 @@ in {
       owners-autoassign
     ];
 
+    package = config.depot.third_party.gerrit;
+
     settings = {
       core.packedGitLimit = "100m";
       log.jsonLogging = true;
diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix
index c7ab47cd66be..98373582b049 100644
--- a/third_party/gerrit/default.nix
+++ b/third_party/gerrit/default.nix
@@ -31,7 +31,7 @@ let
   version = "3.2.1";
 in
 pkgs.buildBazelPackage {
-  name = "gerrit";
+  name = "gerrit-${version}";
 
   src = pkgs.fetchgit {
     url = "https://gerrit.googlesource.com/gerrit";