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

feat(tvix/boot/tests): use pkgs.nixos instead of nixosFor

Browse source 
Using pkgs.nixos directly allows us to create a smaller nixos closure
for the tests and also not depend on things in depot.ops which can be
beneficial for extending the tvix josh workspace.

Change-Id: Ic6ad2122733418114b43aa692d6e42ac1e308eeb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12251
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Ilan Joselevich 2024-08-19 16:08:33 +03:00 committed by clbot
parent 70d199ea44
commit bc967c538d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tvix/boot/tests/default.nix
View file

@ -132,9 +132,7 @@ let
exportReferencesGraph.closure = [ path ]; exportReferencesGraph.closure = [ path ];
}); });
systemFor = sys: (depot.ops.nixos.nixosFor sys).system; testSystem = (pkgs.nixos {
testSystem = systemFor ({ modulesPath, pkgs, ... }: {
# Set some options necessary to evaluate. # Set some options necessary to evaluate.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# TODO: figure out how to disable this without causing eval to fail # TODO: figure out how to disable this without causing eval to fail
@ -154,7 +152,10 @@ let
# Don't warn about stateVersion. # Don't warn about stateVersion.
system.stateVersion = "24.05"; system.stateVersion = "24.05";
});
# Speed-up evaluation and building.
documentation.enable = lib.mkForce false;
}).config.system.build.toplevel;
in in
depot.nix.readTree.drvTargets depot.nix.readTree.drvTargets