update to nixos 23.05
This commit is contained in:
parent
55c64d8dff
commit
e2cce7daa8
8 changed files with 19 additions and 16 deletions
|
|
@ -101,7 +101,7 @@ makeTestVM {
|
|||
|
||||
testScript = { nodes, ... }: let
|
||||
systems = builtins.concatStringsSep ", "
|
||||
(mapAttrsToList (name: node: ''"${name}": "${node.config.system.build.toplevel}"'') nodes);
|
||||
(mapAttrsToList (name: node: ''"${name}": "${node.system.build.toplevel}"'') nodes);
|
||||
in ''
|
||||
systems = { ${systems} }
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
};
|
||||
|
||||
testScript = nodes: let
|
||||
cfg = nodes.nodes.machine.config;
|
||||
cfg = nodes.nodes.machine;
|
||||
data = {
|
||||
data = cfg.test.data;
|
||||
tests = cfg.tests;
|
||||
|
|
|
|||
|
|
@ -390,7 +390,10 @@ in {
|
|||
config
|
||||
];
|
||||
# Share the same pkgs instance among tests
|
||||
nixpkgs.pkgs = pkgs.lib.mkDefault pkgs;
|
||||
# Set priority slightly higher (i.e. to a slightly lower number) than `mkDefault`,
|
||||
# so that this module can be used with function `pkgs.nixos`, which already
|
||||
# sets `nixpkgs.pkgs` with prio `mkDefault`.
|
||||
nixpkgs.pkgs = lib.mkOverride 900 pkgs;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue