mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-25 14:24:40 +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-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
41 lines
1.4 KiB
Nix
41 lines
1.4 KiB
Nix
# A module containing the base imports and overrides that
|
|
# are always applied in NixOS VM tests, unconditionally,
|
|
# even in `inheritParentConfig = false` specialisations.
|
|
{ lib, ... }:
|
|
let
|
|
inherit (lib) mkDefault mkForce;
|
|
in
|
|
{
|
|
imports = [
|
|
../../modules/virtualisation/qemu-vm.nix
|
|
../../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
|
|
{
|
|
key = "no-manual";
|
|
documentation.nixos.enable = false;
|
|
}
|
|
{
|
|
key = "no-revision";
|
|
# Make the revision metadata constant, in order to avoid needless retesting.
|
|
# The human version (e.g. 21.05-pre) is left as is, because it is useful
|
|
# for external modules that test with e.g. testers.nixosTest and rely on that
|
|
# version number.
|
|
config.system.nixos = {
|
|
revision = mkForce "constant-nixos-revision";
|
|
versionSuffix = mkForce "test";
|
|
label = mkForce "test";
|
|
};
|
|
}
|
|
(
|
|
{ config, ... }:
|
|
{
|
|
# Don't pull in switch-to-configuration by default, except when specialisations or early boot shenanigans are involved.
|
|
# This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes.
|
|
key = "no-switch-to-configuration";
|
|
system.switch.enable = mkDefault (
|
|
config.isSpecialisation || config.specialisation != { } || config.virtualisation.installBootLoader
|
|
);
|
|
}
|
|
)
|
|
];
|
|
}
|