diff options
author | Thomas Strobel <ts468@cam.ac.uk> | 2016-01-17 19:34:55 +0100 |
---|---|---|
committer | Thomas Strobel <ts468@cam.ac.uk> | 2016-01-17 19:41:23 +0100 |
commit | a04a7272aa38ada45e694281071b720d4abbd0df (patch) | |
tree | 3cd20fafec2de8e3b5ec558461a779898b4e50ee /nixos/modules/system/boot | |
parent | ae5ef2b00955a8b8cbcc93a6682a8275c4d5e52c (diff) | |
download | nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar.gz nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar.bz2 nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar.lz nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar.xz nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.tar.zst nixlib-a04a7272aa38ada45e694281071b720d4abbd0df.zip |
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
- add missing types in module definitions - add missing 'defaultText' in module definitions - wrap example with 'literalExample' where necessary in module definitions
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 3 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 1 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/grub/ipxe.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index bef18fc8771b..03de445d7822 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -20,6 +20,7 @@ in options = { boot.kernelPackages = mkOption { + type = types.packageSet; default = pkgs.linuxPackages; # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. @@ -63,7 +64,7 @@ in }; boot.extraModulePackages = mkOption { - type = types.listOf types.path; + type = types.listOf types.package; default = []; example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]"; description = "A list of additional packages supplying kernel modules."; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c2bf5764804c..d9f6f51f13a2 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -251,6 +251,7 @@ in }; extraFiles = mkOption { + type = types.attrsOf types.path; default = {}; example = literalExample '' { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; } diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixos/modules/system/boot/loader/grub/ipxe.nix index 9b5097a4cfd9..249c2761934d 100644 --- a/nixos/modules/system/boot/loader/grub/ipxe.nix +++ b/nixos/modules/system/boot/loader/grub/ipxe.nix @@ -39,7 +39,7 @@ in dhcp chain http://boot.ipxe.org/demo/boot.php '''; - }; + } ''; }; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 763703205630..59bff5472e84 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -229,7 +229,7 @@ in boot.initrd.luks.devices = mkOption { default = [ ]; - example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ]; + example = literalExample ''[ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ]''; description = '' The list of devices that should be decrypted using LUKS before trying to mount the root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups. diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 0fc8491cdf8f..211e0423216e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -374,6 +374,7 @@ in systemd.package = mkOption { default = pkgs.systemd; + defaultText = "pkgs.systemd"; type = types.package; description = "The systemd package."; }; |