From aaa994137a89ab9d37fb83091dc7d24937898491 Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 25 Aug 2022 14:54:32 +0200 Subject: fix: reflect renames of Nix configuration options Change-Id: I7e28ac3d71acd7d99a1d3ef97bef9422097e4abf Reviewed-on: https://cl.tvl.fyi/c/depot/+/6154 Tested-by: BuildkiteCI Reviewed-by: tazjin --- ops/machines/whitby/default.nix | 22 +++++++++++----------- ops/modules/tvl-cache.nix | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ops') diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 940cfc910a..eeba2f3543 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -184,17 +184,17 @@ in nix = { nrBuildUsers = 256; - maxJobs = lib.mkDefault 64; - extraOptions = '' - secret-key-files = /run/agenix/nix-cache-priv - ''; - - trustedUsers = [ - "grfn" - "lukegb" - "tazjin" - "sterni" - ]; + settings = { + max-jobs = lib.mkDefault 64; + secret-key-files = "/run/agenix/nix-cache-priv"; + + trusted-users = [ + "grfn" + "lukegb" + "tazjin" + "sterni" + ]; + }; sshServe = { enable = true; diff --git a/ops/modules/tvl-cache.nix b/ops/modules/tvl-cache.nix index 4d574821df..683818d103 100644 --- a/ops/modules/tvl-cache.nix +++ b/ops/modules/tvl-cache.nix @@ -6,12 +6,12 @@ }; config = lib.mkIf config.tvl.cache.enable { - nix = { - binaryCachePublicKeys = [ + nix.settings = { + trusted-public-keys = [ "cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk=" ]; - binaryCaches = [ + substituters = [ "https://cache.tvl.su" ]; }; -- cgit 1.4.1