diff options
| author | sterni <sternenseemann@systemli.org> | 2022-08-25T12·54+0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-08-25T16·34+0000 |
| commit | aaa994137a89ab9d37fb83091dc7d24937898491 (patch) | |
| tree | 96582a1b2911de6f2ba631e79491e20793977a5a /ops | |
| parent | 0c4c307926232549f7cfca8f584fb66c31f60bf2 (diff) | |
fix: reflect renames of Nix configuration options r/4490
Change-Id: I7e28ac3d71acd7d99a1d3ef97bef9422097e4abf Reviewed-on: https://cl.tvl.fyi/c/depot/+/6154 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'ops')
| -rw-r--r-- | ops/machines/whitby/default.nix | 22 | ||||
| -rw-r--r-- | ops/modules/tvl-cache.nix | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 940cfc910a24..eeba2f354328 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 4d574821df44..683818d103b7 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" ]; }; |