From d85c6a1b56eae850a972d7c0708525a736d33d01 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Wed, 15 Dec 2021 18:09:46 -0500 Subject: feat(ops/modules): Provide some modules to all nixoses For modules that are gated behind a mkEnableOption, it's reasonable to just provide them to all Depot-built nixos systems without requiring people to explicitly import them. This defines a special module called `default-imports.nix` which imports these modules (currently just tvl-cache.nix and automatic-gc.nix, as I'm being rather conservative adding things here to avoid breaking anyone's system), then provides that module as one of the `modules` passed at the top-level nixos/eval-config invocation. Change-Id: I3be299ab10ae4c451ef11c514edb3c89318a2278 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4345 Tested-by: BuildkiteCI Autosubmit: grfn Reviewed-by: tazjin --- third_party/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'third_party/default.nix') diff --git a/third_party/default.nix b/third_party/default.nix index 5a244ed220..e9e3c117ce 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -12,7 +12,7 @@ # other folders below //third_party, other than the ones mentioned # above. -{ pkgs, ... }: +{ pkgs, depot, ... }: { # Expose a partially applied NixOS, expecting an attribute set with @@ -33,7 +33,10 @@ let eval = import "${pkgs.path}/nixos/lib/eval-config.nix" { inherit specialArgs system; - modules = [ configuration ]; + modules = [ + configuration + (import "${depot.path + "/ops/modules/default-imports.nix"}") + ]; }; # This is for `nixos-rebuild build-vm'. -- cgit 1.4.1