diff options
author | Thibaut Marty <github@thibautmarty.fr> | 2020-04-28 19:13:21 +0200 |
---|---|---|
committer | Thibaut Marty <github@thibautmarty.fr> | 2020-04-28 19:13:59 +0200 |
commit | 4a0beed5c0cd04f1641c03847eed83841e9f85fb (patch) | |
tree | 45566d8cff46144f83d3f195120f42ad13303f2a /nixos/modules/services | |
parent | 27c7e7d38ab9ae972c2802bcea0253875eeed48e (diff) | |
download | nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar.gz nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar.bz2 nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar.lz nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar.xz nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.tar.zst nixpkgs-4a0beed5c0cd04f1641c03847eed83841e9f85fb.zip |
treewide: fix modules options types where the default is null
They can be caught with `nixos-option -r` on an empty ({...}:{}) NixOS configuration.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/audio/icecast.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/hardware/fancontrol.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/gammu-smsd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/network-filesystems/orangefs/server.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/monero.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/namecoind.nix | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix index 6a8a0f9975b..e9a54c5c255 100644 --- a/nixos/modules/services/audio/icecast.nix +++ b/nixos/modules/services/audio/icecast.nix @@ -47,7 +47,7 @@ in { enable = mkEnableOption "Icecast server"; hostname = mkOption { - type = types.str; + type = types.nullOr types.str; description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; default = config.networking.domain; }; diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index bb4541a784d..e1ce11a5aef 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -12,7 +12,7 @@ in{ config = mkOption { default = null; - type = types.lines; + type = types.nullOr types.lines; description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package."; example = '' # Configuration file generated by pwmconfig diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 3057d7fd1a0..552725f1384 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -172,7 +172,7 @@ in { }; database = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = "Database name to store sms data"; }; diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix index 74ebdc13402..8eb754fe611 100644 --- a/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -83,14 +83,14 @@ in { }; dataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/storage"; description = "Directory for data storage."; }; metadataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/meta"; description = "Directory for meta data storage."; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index b9536430868..3e7aaf6efb5 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -87,7 +87,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index ead7f085943..19cedb7bfc6 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -89,7 +89,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. |