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/misc | |
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/misc')
-rw-r--r-- | nixos/modules/misc/crashdump.nix | 1 | ||||
-rw-r--r-- | nixos/modules/misc/nixos.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 773b5ac9da3e..5ef4b7781bd0 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -24,6 +24,7 @@ in ''; }; kernelPackages = mkOption { + type = types.package; default = pkgs.linuxPackages; # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. diff --git a/nixos/modules/misc/nixos.nix b/nixos/modules/misc/nixos.nix index 356129211d06..84365b640a48 100644 --- a/nixos/modules/misc/nixos.nix +++ b/nixos/modules/misc/nixos.nix @@ -37,8 +37,8 @@ with lib; nixos.extraModules = mkOption { default = []; - example = literalExample "mkIf config.services.openssh.enable [ ./sshd-config.nix ]"; - type = types.listOf types.unspecified; + example = literalExample "[ ./sshd-config.nix ]"; + type = types.listOf (types.either (types.submodule ({...}:{options={};})) types.path); description = '' Define additional modules which would be loaded to evaluate the configuration. |