mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
374e6bcc40
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:
nix-build ci -A fmt.check
This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).
This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).
Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).
If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
88 lines
2.5 KiB
Nix
88 lines
2.5 KiB
Nix
import ./make-test-python.nix (
|
|
{
|
|
pkgs,
|
|
lib,
|
|
withNg ? false,
|
|
...
|
|
}:
|
|
{
|
|
name = "nixos-rebuild-install-bootloader";
|
|
|
|
nodes = {
|
|
machine =
|
|
{ lib, pkgs, ... }:
|
|
{
|
|
imports = [
|
|
../modules/profiles/installation-device.nix
|
|
../modules/profiles/base.nix
|
|
];
|
|
|
|
nix.settings = {
|
|
substituters = lib.mkForce [ ];
|
|
hashed-mirrors = null;
|
|
connect-timeout = 1;
|
|
};
|
|
|
|
system.includeBuildDependencies = true;
|
|
system.rebuild.enableNg = withNg;
|
|
|
|
virtualisation = {
|
|
cores = 2;
|
|
memorySize = 2048;
|
|
};
|
|
|
|
virtualisation.useBootLoader = true;
|
|
};
|
|
};
|
|
|
|
testScript =
|
|
let
|
|
configFile =
|
|
pkgs.writeText "configuration.nix" # nix
|
|
''
|
|
{ lib, pkgs, ... }: {
|
|
imports = [
|
|
./hardware-configuration.nix
|
|
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
|
];
|
|
|
|
boot.loader.grub = {
|
|
enable = true;
|
|
device = "/dev/vda";
|
|
forceInstall = true;
|
|
};
|
|
|
|
system.rebuild.enableNg = ${lib.boolToString withNg};
|
|
documentation.enable = false;
|
|
}
|
|
'';
|
|
|
|
in
|
|
# python
|
|
''
|
|
machine.start()
|
|
machine.succeed("udevadm settle")
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
machine.succeed("nixos-generate-config")
|
|
machine.copy_from_host(
|
|
"${configFile}",
|
|
"/etc/nixos/configuration.nix",
|
|
)
|
|
machine.succeed("nixos-rebuild switch")
|
|
|
|
# Need to run `nixos-rebuild` twice because the first run will install
|
|
# GRUB anyway
|
|
with subtest("Switch system again and install bootloader"):
|
|
result = machine.succeed("nixos-rebuild switch --install-bootloader 2>&1")
|
|
# install-grub2.pl messages
|
|
assert "updating GRUB 2 menu..." in result
|
|
assert "installing the GRUB 2 boot loader on /dev/vda..." in result
|
|
# GRUB message
|
|
assert "Installation finished. No error reported." in result
|
|
# at this point we've tested regression #262724, but haven't tested the bootloader itself
|
|
# TODO: figure out how to how to tell the test driver to start the bootloader instead of
|
|
# booting into the kernel directly.
|
|
'';
|
|
}
|
|
)
|