From b35e358eb5841b62caa8408ce2dbee105bf8d9c8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 2 Apr 2021 12:18:50 +0000 Subject: refactor(ops/nixos): migrate to depot module arg Previously the depot argument was provided as config.depot, but the "new way" of doing things (which is more like the args list provided in the rest of the depot) is to provide this as the "depot" NixOS module argument instead. Change-Id: Ib48b1c7c1bdff9c1eb0618c6cbacc22b651f5f98 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2763 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: glittershark --- ops/nixos/tvl-slapd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ops/nixos/tvl-slapd/default.nix') diff --git a/ops/nixos/tvl-slapd/default.nix b/ops/nixos/tvl-slapd/default.nix index d32bc96b832d..ae99fced7499 100644 --- a/ops/nixos/tvl-slapd/default.nix +++ b/ops/nixos/tvl-slapd/default.nix @@ -1,9 +1,9 @@ # Configures an OpenLDAP instance for TVL # # TODO(tazjin): Configure ldaps:// -{ config, lib, pkgs, ... }: +{ depot, lib, pkgs, ... }: -with config.depot.nix.yants; +with depot.nix.yants; let user = struct { @@ -24,7 +24,7 @@ let userPassword: ${u.password} ''); - inherit (config.depot.ops) users; + inherit (depot.ops) users; in { # Use our patched OpenLDAP derivation which enables stronger password hashing. @@ -34,7 +34,7 @@ in { # *large* number of rebuilds of packages such as GPG and Python. nixpkgs.overlays = [ (_: _: { - inherit (config.depot.third_party) openldap; + inherit (depot.third_party) openldap; }) ]; -- cgit 1.4.1