From 4a89bcd6a5cd409731d7d80fe3dbe364ba00c187 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 24 May 2021 23:29:44 +0200 Subject: refactor(ops/nixos): Pass `depot` as a special argument This changes the evaluation order for the `depot` argument and ensures it is partially evaluated before the module system starts resolving imports. This way we can import modules from `depot.path` without `depot` having to come from readTree. Fixes b/129. Change-Id: Icf4dd2be15011055dac8b27e991a4ff6a12bf827 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3156 Tested-by: BuildkiteCI Reviewed-by: grfn --- ops/nixos.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ops') diff --git a/ops/nixos.nix b/ops/nixos.nix index 0fdb50a99b..19ba0168c0 100644 --- a/ops/nixos.nix +++ b/ops/nixos.nix @@ -5,10 +5,6 @@ let inherit (lib) findFirst isAttrs; in rec { # This provides our standard set of arguments to all NixOS modules. baseModule = { ... }: { - _module.args = { - inherit (args) depot; - }; - # Ensure that pkgs == third_party.nix nixpkgs.pkgs = depot.third_party.nixpkgs; nix.nixPath = [ @@ -24,6 +20,10 @@ in rec { configuration ]; }; + + specialArgs = { + inherit (args) depot; + }; }); findSystem = hostname: -- cgit 1.4.1