mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ops/nixos): Pass depot as a special argument

Browse source 
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 <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2021-05-24 23:29:44 +02:00 committed by tazjin
parent 0491fb24bf
commit 4a89bcd6a5
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ops/nixos.nix
View file

@ -5,10 +5,6 @@ let inherit (lib) findFirst isAttrs;
in rec { in rec {
# This provides our standard set of arguments to all NixOS modules. # This provides our standard set of arguments to all NixOS modules.
baseModule = { ... }: { baseModule = { ... }: {
_module.args = {
inherit (args) depot;
};
# Ensure that pkgs == third_party.nix # Ensure that pkgs == third_party.nix
nixpkgs.pkgs = depot.third_party.nixpkgs; nixpkgs.pkgs = depot.third_party.nixpkgs;
nix.nixPath = [ nix.nixPath = [
@ -24,6 +20,10 @@ in rec {
configuration configuration
]; ];
}; };
specialArgs = {
inherit (args) depot;
};
}); });
findSystem = hostname: findSystem = hostname:

35
third_party/default.nix vendored
View file

@ -17,7 +17,36 @@
{ {
# Expose a partially applied NixOS, expecting an attribute set with # Expose a partially applied NixOS, expecting an attribute set with
# a `configuration` key. Exposing it like this makes it possible to # a `configuration` key. Exposing it like this makes it possible to
# modify some of the base configuration used by NixOS. passed to # modify some of the base configuration used by NixOS.
# this. #
nixos = import "${pkgs.path}/nixos"; # This partially reimplements the code in
# <nixpkgs/nixos/default.nix> as we need to modify its internals to
# be able to pass `specialArgs`. We depend on this because `depot`
# needs to be partially evaluated in NixOS configuration before
# module imports are resolved.
nixos = {
configuration,
specialArgs ? {},
system ? builtins.currentSystem,
...
}:
let
eval = import "${pkgs.path}/nixos/lib/eval-config.nix" {
inherit specialArgs system;
modules = [ configuration ];
};
# This is for `nixos-rebuild build-vm'.
vmConfig = (import "${pkgs.path}/nixos/lib/eval-config.nix" {
inherit specialArgs system;
modules = [
configuration
"${pkgs.path}/nixos/modules/virtualisation/qemu-vm.nix"
];
}).config;
in {
inherit (eval) pkgs config options;
system = eval.config.system.build.toplevel;
vm = vmConfig.system.build.vm;
};
} }