4a9d9928dc
The `nix.*` options, apart from options for setting up the daemon itself, currently provide a lot of setting mappings for the Nix daemon configuration. The scope of the mapping yields convience, but the line where an option is considered essential is blurry. For instance, the `extra-sandbox-paths` mapping is provided without its primary consumer, and the corresponding `sandbox-paths` option is also not mapped. The current system increases the maintenance burden as maintainers have to closely follow upstream changes. In this case, there are two state versions of Nix which have to be maintained collectively, with different options avaliable. This commit aims to following the standard outlined in RFC 42[1] to implement a structural setting pattern. The Nix configuration is encoded at its core as key-value pairs which maps nicely to attribute sets, making it feasible to express in the Nix language itself. Some existing options are kept such as `buildMachines` and `registry` which present a simplified interface to managing the respective settings. The interface is exposed as `nix.settings`. Legacy configurations are mapped to their corresponding options under `nix.settings` for backwards compatibility. Various options settings in other nixos modules and relevant tests have been updated to use structural setting for consistency. The generation and validation of the configration file has been modified to use `writeTextFile` instead of `runCommand` for clarity. Note that validation is now mandatory as strict checking of options has been pushed down to the derivation level due to freeformType consuming unmatched options. Furthermore, validation can not occur when cross-compiling due to current limitations. A new option `publicHostKey` was added to the `buildMachines` submodule corresponding to the base64 encoded public host key settings exposed in the builder syntax. The build machine generation was subsequently rewritten to use `concatStringsSep` for better performance by grouping concatenations. [1] - https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
122 lines
3.6 KiB
Nix
122 lines
3.6 KiB
Nix
import ./make-test-python.nix ({pkgs, lib, ...}:
|
|
let
|
|
# A filesystem image with a (presumably) bootable debian
|
|
debianImage = pkgs.vmTools.diskImageFuns.debian9i386 {
|
|
# os-prober cannot detect systems installed on disks without a partition table
|
|
# so we create the disk ourselves
|
|
createRootFS = with pkgs; ''
|
|
${parted}/bin/parted --script /dev/vda mklabel msdos
|
|
${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
|
|
mkdir /mnt
|
|
${e2fsprogs}/bin/mkfs.ext4 /dev/vda1
|
|
${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt
|
|
|
|
if test -e /mnt/.debug; then
|
|
exec ${bash}/bin/sh
|
|
fi
|
|
touch /mnt/.debug
|
|
|
|
mkdir /mnt/proc /mnt/dev /mnt/sys
|
|
'';
|
|
extraPackages = [
|
|
# /etc/os-release
|
|
"base-files"
|
|
# make the disk bootable-looking
|
|
"grub2" "linux-image-686"
|
|
];
|
|
# install grub
|
|
postInstall = ''
|
|
ln -sf /proc/self/mounts > /etc/mtab
|
|
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
|
|
grub-install /dev/vda --force
|
|
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
|
|
update-grub
|
|
'';
|
|
};
|
|
|
|
# a part of the configuration of the test vm
|
|
simpleConfig = {
|
|
boot.loader.grub = {
|
|
enable = true;
|
|
useOSProber = true;
|
|
device = "/dev/vda";
|
|
# vda is a filesystem without partition table
|
|
forceInstall = true;
|
|
};
|
|
nix.settings = {
|
|
substituters = lib.mkForce [];
|
|
hashed-mirrors = null;
|
|
connect-timeout = 1;
|
|
};
|
|
# save some memory
|
|
documentation.enable = false;
|
|
};
|
|
# /etc/nixos/configuration.nix for the vm
|
|
configFile = pkgs.writeText "configuration.nix" ''
|
|
{config, pkgs, lib, ...}: ({
|
|
imports =
|
|
[ ./hardware-configuration.nix
|
|
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
|
];
|
|
} // lib.importJSON ${
|
|
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
|
|
})
|
|
'';
|
|
in {
|
|
name = "os-prober";
|
|
|
|
machine = { config, pkgs, ... }: (simpleConfig // {
|
|
imports = [ ../modules/profiles/installation-device.nix
|
|
../modules/profiles/base.nix ];
|
|
virtualisation.memorySize = 1300;
|
|
# To add the secondary disk:
|
|
virtualisation.qemu.options = [ "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio" ];
|
|
|
|
# The test cannot access the network, so any packages
|
|
# nixos-rebuild needs must be included in the VM.
|
|
system.extraDependencies = with pkgs;
|
|
[ sudo
|
|
libxml2.bin
|
|
libxslt.bin
|
|
desktop-file-utils
|
|
docbook5
|
|
docbook_xsl_ns
|
|
unionfs-fuse
|
|
ntp
|
|
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
|
perlPackages.XMLLibXML
|
|
perlPackages.ListCompare
|
|
shared-mime-info
|
|
texinfo
|
|
xorg.lndir
|
|
grub2
|
|
|
|
# add curl so that rather than seeing the test attempt to download
|
|
# curl's tarball, we see what it's trying to download
|
|
curl
|
|
];
|
|
});
|
|
|
|
testScript = ''
|
|
machine.start()
|
|
machine.succeed("udevadm settle")
|
|
machine.wait_for_unit("multi-user.target")
|
|
print(machine.succeed("lsblk"))
|
|
|
|
# check that os-prober works standalone
|
|
machine.succeed(
|
|
"${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1"
|
|
)
|
|
|
|
# rebuild and test that debian is available in the grub menu
|
|
machine.succeed("nixos-generate-config")
|
|
machine.copy_from_host(
|
|
"${configFile}",
|
|
"/etc/nixos/configuration.nix",
|
|
)
|
|
machine.succeed("nixos-rebuild boot --show-trace >&2")
|
|
|
|
machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
|
|
'';
|
|
})
|