mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 18:44:07 +00:00
4f0dadbf38
After final improvements to the official formatter implementation, this commit now performs the first treewide reformat of Nix files using it. This is part of the implementation of RFC 166. Only "inactive" files are reformatted, meaning only files that aren't being touched by any PR with activity in the past 2 months. This is to avoid conflicts for PRs that might soon be merged. Later we can do a full treewide reformat to get the rest, which should not cause as many conflicts. A CI check has already been running for some time to ensure that new and already-formatted files are formatted, so the files being reformatted here should also stay formatted. This commit was automatically created and can be verified using nix-builda08b3a4d19
.tar.gz \ --argstr baseRevb32a094368
result/bin/apply-formatting $NIXPKGS_PATH
204 lines
5.6 KiB
Nix
204 lines
5.6 KiB
Nix
{
|
|
system ? builtins.currentSystem,
|
|
config ? { },
|
|
pkgs ? import ../.. { inherit system config; },
|
|
}:
|
|
|
|
with import ../lib/testing-python.nix { inherit system pkgs; };
|
|
with pkgs.lib;
|
|
|
|
let
|
|
baseline = {
|
|
virtualisation.useBootLoader = true;
|
|
};
|
|
grub = {
|
|
boot.loader.grub.enable = true;
|
|
};
|
|
systemd-boot = {
|
|
boot.loader.systemd-boot.enable = true;
|
|
};
|
|
uefi = {
|
|
virtualisation.useEFIBoot = true;
|
|
boot.loader.efi.canTouchEfiVariables = true;
|
|
boot.loader.grub.efiSupport = true;
|
|
environment.systemPackages = [ pkgs.efibootmgr ];
|
|
};
|
|
standard = {
|
|
boot.bootspec.enable = true;
|
|
|
|
imports = [
|
|
baseline
|
|
systemd-boot
|
|
uefi
|
|
];
|
|
};
|
|
in
|
|
{
|
|
basic = makeTest {
|
|
name = "systemd-boot-with-bootspec";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = standard;
|
|
|
|
testScript = ''
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
'';
|
|
};
|
|
|
|
grub = makeTest {
|
|
name = "grub-with-bootspec";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = {
|
|
boot.bootspec.enable = true;
|
|
|
|
imports = [
|
|
baseline
|
|
grub
|
|
uefi
|
|
];
|
|
};
|
|
|
|
testScript = ''
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
'';
|
|
};
|
|
|
|
legacy-boot = makeTest {
|
|
name = "legacy-boot-with-bootspec";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = {
|
|
boot.bootspec.enable = true;
|
|
|
|
imports = [
|
|
baseline
|
|
grub
|
|
];
|
|
};
|
|
|
|
testScript = ''
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
'';
|
|
};
|
|
|
|
# Check that initrd create corresponding entries in bootspec.
|
|
initrd = makeTest {
|
|
name = "bootspec-with-initrd";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = {
|
|
imports = [ standard ];
|
|
environment.systemPackages = [ pkgs.jq ];
|
|
# It's probably the case, but we want to make it explicit here.
|
|
boot.initrd.enable = true;
|
|
};
|
|
|
|
testScript = ''
|
|
import json
|
|
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
|
|
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
|
|
|
|
assert 'initrd' in bootspec, "Bootspec should contain initrd field when initrd is enabled"
|
|
assert 'initrdSecrets' not in bootspec, "Bootspec should not contain initrdSecrets when there's no initrdSecrets"
|
|
'';
|
|
};
|
|
|
|
# Check that initrd secrets create corresponding entries in bootspec.
|
|
initrd-secrets = makeTest {
|
|
name = "bootspec-with-initrd-secrets";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = {
|
|
imports = [ standard ];
|
|
environment.systemPackages = [ pkgs.jq ];
|
|
# It's probably the case, but we want to make it explicit here.
|
|
boot.initrd.enable = true;
|
|
boot.initrd.secrets."/some/example" = pkgs.writeText "example-secret" "test";
|
|
};
|
|
|
|
testScript = ''
|
|
import json
|
|
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
|
|
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
|
|
|
|
assert 'initrdSecrets' in bootspec, "Bootspec should contain an 'initrdSecrets' field given there's an initrd secret"
|
|
'';
|
|
};
|
|
|
|
# Check that specialisations create corresponding entries in bootspec.
|
|
specialisation = makeTest {
|
|
name = "bootspec-with-specialisation";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine = {
|
|
imports = [ standard ];
|
|
environment.systemPackages = [ pkgs.jq ];
|
|
specialisation.something.configuration = { };
|
|
};
|
|
|
|
testScript = ''
|
|
import json
|
|
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("test -e /run/current-system/boot.json")
|
|
machine.succeed("test -e /run/current-system/specialisation/something/boot.json")
|
|
|
|
sp_in_parent = json.loads(machine.succeed("jq -r '.\"org.nixos.specialisation.v1\".something' /run/current-system/boot.json"))
|
|
sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json"))
|
|
|
|
assert sp_in_parent['org.nixos.bootspec.v1'] == sp_in_fs['org.nixos.bootspec.v1'], "Bootspecs of the same specialisation are different!"
|
|
'';
|
|
};
|
|
|
|
# Check that extensions are propagated.
|
|
extensions = makeTest {
|
|
name = "bootspec-with-extensions";
|
|
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
|
|
|
|
nodes.machine =
|
|
{ config, ... }:
|
|
{
|
|
imports = [ standard ];
|
|
environment.systemPackages = [ pkgs.jq ];
|
|
boot.bootspec.extensions = {
|
|
"org.nix-tests.product" = {
|
|
osRelease = config.environment.etc."os-release".source;
|
|
};
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
machine.start()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
current_os_release = machine.succeed("cat /etc/os-release")
|
|
bootspec_os_release = machine.succeed("cat $(jq -r '.\"org.nix-tests.product\".osRelease' /run/current-system/boot.json)")
|
|
|
|
assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents"
|
|
'';
|
|
};
|
|
|
|
}
|