From 862e3dd977cdd853c3ab3202ab1b73561f8a3ea1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Oct 2013 11:02:04 +0100 Subject: Substitute "types.uniq types.string" -> "types.str" --- nixos/doc/manual/development.xml | 2 +- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/swap.nix | 4 ++-- nixos/modules/config/timezone.nix | 2 +- nixos/modules/config/users-groups.nix | 12 ++++++------ nixos/modules/misc/version.nix | 10 +++++----- nixos/modules/security/pam.nix | 2 +- nixos/modules/services/audio/fuppes.nix | 10 +++++----- nixos/modules/services/logging/logcheck.nix | 18 +++++++++--------- nixos/modules/services/logging/syslogd.nix | 2 +- nixos/modules/services/mail/freepops.nix | 8 ++++---- nixos/modules/services/misc/nix-gc.nix | 4 ++-- nixos/modules/services/monitoring/dd-agent.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 6 +++--- nixos/modules/services/monitoring/statsd.nix | 8 ++++---- nixos/modules/services/monitoring/ups.nix | 8 ++++---- nixos/modules/services/networking/avahi-daemon.nix | 2 +- nixos/modules/services/networking/cntlm.nix | 2 +- nixos/modules/services/networking/iodined.nix | 6 +++--- nixos/modules/services/networking/wpa_supplicant.nix | 4 ++-- nixos/modules/services/search/elasticsearch.nix | 12 ++++++------ .../modules/services/web-servers/lighttpd/default.nix | 2 +- nixos/modules/services/web-servers/lighttpd/gitweb.nix | 4 ++-- .../modules/services/x11/desktop-managers/default.nix | 2 +- .../modules/services/x11/display-managers/default.nix | 2 +- nixos/modules/services/x11/window-managers/default.nix | 2 +- nixos/modules/system/activation/top-level.nix | 2 +- nixos/modules/system/boot/loader/grub/grub.nix | 4 ++-- nixos/modules/system/boot/stage-2.nix | 6 +++--- nixos/modules/system/boot/systemd-unit-options.nix | 16 ++++++++-------- nixos/modules/system/boot/systemd.nix | 10 +++++----- nixos/modules/tasks/cpu-freq.nix | 2 +- nixos/modules/tasks/filesystems.nix | 4 ++-- nixos/modules/tasks/network-interfaces.nix | 10 +++++----- nixos/modules/tasks/scsi-link-power-management.nix | 2 +- 35 files changed, 97 insertions(+), 97 deletions(-) diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml index 775143cc835..b7b232fa8ef 100644 --- a/nixos/doc/manual/development.xml +++ b/nixos/doc/manual/development.xml @@ -265,7 +265,7 @@ in period = mkOption { default = "15 02 * * *"; - type = with types; uniq string; + type = types.str; description = '' This option defines (in the format used by cron) when the locate database is updated. diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index c3e39717258..5570bb1adf6 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -55,7 +55,7 @@ in description = " The keyboard mapping table for the virtual consoles. "; - type = types.uniq types.string; + type = types.str; }; }; diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index fb171050d3e..65d7722abfa 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -34,13 +34,13 @@ with utils; device = mkOption { example = "/dev/sda3"; - type = types.uniq types.string; + type = types.str; description = "Path of the device."; }; label = mkOption { example = "swap"; - type = types.uniq types.string; + type = types.str; description = '' Label of the device. Can be used instead of device. ''; diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index e185584846a..07a76d9ad1f 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -9,7 +9,7 @@ with pkgs.lib; timeZone = mkOption { default = "CET"; - type = with types; uniq string; + type = types.str; example = "America/New_York"; description = "The time zone used when displaying times and dates."; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 5f32dc350df..383f87120e0 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -12,12 +12,12 @@ let options = { name = mkOption { - type = with types; uniq string; + type = types.str; description = "The name of the user account. If undefined, the name of the attribute set will be used."; }; description = mkOption { - type = with types; uniq string; + type = types.str; default = ""; description = "A short description of the user account."; }; @@ -29,7 +29,7 @@ let }; group = mkOption { - type = with types; uniq string; + type = types.str; default = "nogroup"; description = "The user's primary group."; }; @@ -41,13 +41,13 @@ let }; home = mkOption { - type = with types; uniq string; + type = types.str; default = "/var/empty"; description = "The user's home directory."; }; shell = mkOption { - type = with types; uniq string; + type = types.str; default = "/run/current-system/sw/sbin/nologin"; description = "The path to the user's shell."; }; @@ -107,7 +107,7 @@ let options = { name = mkOption { - type = with types; uniq string; + type = types.str; description = "The name of the group. If undefined, the name of the attribute set will be used."; }; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 5ab24686152..86898bbb379 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -8,31 +8,31 @@ with pkgs.lib; system.nixosVersion = mkOption { internal = true; - type = types.uniq types.string; + type = types.str; description = "NixOS version."; }; system.nixosVersionSuffix = mkOption { internal = true; - type = types.uniq types.string; + type = types.str; description = "NixOS version suffix."; }; system.nixosRevision = mkOption { internal = true; - type = types.uniq types.string; + type = types.str; description = "NixOS Git revision hash."; }; system.nixosCodeName = mkOption { internal = true; - type = types.uniq types.string; + type = types.str; description = "NixOS release code name."; }; system.defaultChannel = mkOption { internal = true; - type = types.uniq types.string; + type = types.str; default = https://nixos.org/channels/nixos-unstable; description = "Default NixOS channel to which the root user is subscribed."; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 1081b41299d..69a1972e9e7 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -13,7 +13,7 @@ let name = mkOption { example = "sshd"; - type = types.uniq types.string; + type = types.str; description = "Name of the PAM service."; }; diff --git a/nixos/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix index 9c8849e525b..3eb0732bae2 100644 --- a/nixos/modules/services/audio/fuppes.nix +++ b/nixos/modules/services/audio/fuppes.nix @@ -21,7 +21,7 @@ with pkgs.lib; name = mkOption { example = "Media Center"; - type = with types; uniq string; + type = types.str; description = '' Enables Fuppes (UPnP A/V Media Server). Can be used to watch photos, video and listen to music from a phone/tv connected to the @@ -41,7 +41,7 @@ with pkgs.lib; file = mkOption { default = "/var/log/fuppes.log"; - type = with types; uniq string; + type = types.str; description = '' File which will contains the log produced by the daemon. ''; @@ -50,7 +50,7 @@ with pkgs.lib; config = mkOption { example = "/etc/fuppes/fuppes.cfg"; - type = with types; uniq string; + type = types.str; description = '' Mutable configuration file which can be edited with the web interface. Due to possible modification, double quote the full @@ -69,7 +69,7 @@ with pkgs.lib; database = mkOption { default = "/var/lib/fuppes/fuppes.db"; - type = with types; uniq string; + type = types.str; description = '' Database file which index all shared files. ''; @@ -88,7 +88,7 @@ with pkgs.lib; user = mkOption { default = "root"; # The default is not secure. example = "fuppes"; - type = with types; uniq string; + type = types.str; description = '' Name of the user which own the configuration files and under which the fuppes daemon will be executed. diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 23f21b6a754..2a6a6516f48 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -52,7 +52,7 @@ let levelOption = mkOption { default = "server"; - type = types.uniq types.string; + type = types.str; description = '' Set the logcheck level. Either "workstation", "server", or "paranoid". ''; @@ -63,7 +63,7 @@ let regex = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; description = '' Regex specifying which log lines to ignore. ''; @@ -73,7 +73,7 @@ let ignoreCronOptions = { user = mkOption { default = "root"; - type = types.uniq types.string; + type = types.str; description = '' User that runs the cronjob. ''; @@ -81,7 +81,7 @@ let cmdline = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; description = '' Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. ''; @@ -89,7 +89,7 @@ let timeArgs = mkOption { default = null; - type = types.nullOr (types.uniq types.string); + type = types.nullOr (types.str); example = "02 06 * * *"; description = '' "min hr dom mon dow" crontab time args, to auto-create a cronjob too. @@ -112,7 +112,7 @@ in user = mkOption { default = "logcheck"; - type = types.uniq types.string; + type = types.str; description = '' Username for the logcheck user. ''; @@ -121,7 +121,7 @@ in timeOfDay = mkOption { default = "*"; example = "6"; - type = types.uniq types.string; + type = types.str; description = '' Time of day to run logcheck. A logcheck will be scheduled at xx:02 each day. Leave default (*) to run every hour. Of course when nothing special was logged, @@ -132,7 +132,7 @@ in mailTo = mkOption { default = "root"; example = "you@domain.com"; - type = types.uniq types.string; + type = types.str; description = '' Email address to send reports to. ''; @@ -140,7 +140,7 @@ in level = mkOption { default = "server"; - type = types.uniq types.string; + type = types.str; description = '' Set the logcheck level. Either "workstation", "server", or "paranoid". ''; diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index 24cd5c1567e..c1a66aaa3cc 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -46,7 +46,7 @@ in }; tty = mkOption { - type = types.uniq types.string; + type = types.str; default = "tty10"; description = '' The tty device on which syslogd will print important log diff --git a/nixos/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix index 8f6e9382607..79f211ad86e 100644 --- a/nixos/modules/services/mail/freepops.nix +++ b/nixos/modules/services/mail/freepops.nix @@ -35,7 +35,7 @@ in bind = mkOption { default = "0.0.0.0"; - type = with types; uniq string; + type = types.str; description = '' Bind over an IPv4 address instead of any. ''; @@ -44,7 +44,7 @@ in logFile = mkOption { default = "/var/log/freepopsd"; example = "syslog"; - type = with types; uniq string; + type = types.str; description = '' Filename of the log file or syslog to rely on the logging daemon. ''; @@ -53,7 +53,7 @@ in suid = { user = mkOption { default = "nobody"; - type = with types; uniq string; + type = types.str; description = '' User name under which freepopsd will be after binding the port. ''; @@ -61,7 +61,7 @@ in group = mkOption { default = "nogroup"; - type = with types; uniq string; + type = types.str; description = '' Group under which freepopsd will be after binding the port. ''; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 0d7bc13b2ee..fa20e0956f5 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -22,7 +22,7 @@ in dates = mkOption { default = "03:15"; - type = types.uniq types.string; + type = types.str; description = '' Specification (in the format described by systemd.time @@ -34,7 +34,7 @@ in options = mkOption { default = ""; example = "--max-freed $((64 * 1024**3))"; - type = types.uniq types.string; + type = types.str; description = '' Options given to nix-collect-garbage when the garbage collector is run automatically. diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index ef658523c1f..f99114ac9ad 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -26,7 +26,7 @@ in { example = "ae0aa6a8f08efa988ba0a17578f009ab"; - type = types.uniq types.string; + type = types.str; }; hostname = mkOption { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 93673351438..08e6ef662cc 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -32,13 +32,13 @@ in { host = mkOption { description = "Graphite web frontend listen address"; default = "127.0.0.1"; - type = types.uniq types.string; + type = types.str; }; port = mkOption { description = "Graphite web frontend port"; default = "8080"; - type = types.uniq types.string; + type = types.str; }; }; @@ -56,7 +56,7 @@ in { LOG_UPDATES = False LOG_CACHE_HITS = False ''; - type = types.uniq types.string; + type = types.str; }; enableCache = mkOption { diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 120c8860d57..979debefdd9 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -36,7 +36,7 @@ in host = mkOption { description = "Address that statsd listens on over UDP"; default = "127.0.0.1"; - type = types.uniq types.string; + type = types.str; }; port = mkOption { @@ -48,7 +48,7 @@ in mgmt_address = mkOption { description = "Address to run managment TCP interface on"; default = "127.0.0.1"; - type = types.uniq types.string; + type = types.str; }; mgmt_port = mkOption { @@ -65,7 +65,7 @@ in graphiteHost = mkOption { description = "Hostname or IP of Graphite server"; default = "127.0.0.1"; - type = types.uniq types.string; + type = types.str; }; graphitePort = mkOption { @@ -77,7 +77,7 @@ in extraConfig = mkOption { default = ""; description = "Extra configuration options for statsd"; - type = types.uniq types.string; + type = types.str; }; }; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index a7b72e53f0a..c00f4bad935 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -15,7 +15,7 @@ let # This can be infered from the UPS model by looking at # /nix/store/nut/share/driver.list driver = mkOption { - type = types.uniq types.string; + type = types.str; description = '' Specify the program to run to talk to this UPS. apcsmart, bestups, and sec are some examples. @@ -23,7 +23,7 @@ let }; port = mkOption { - type = types.uniq types.string; + type = types.str; description = '' The serial port to which your UPS is connected. /dev/ttyS0 is usually the first port on Linux boxes, for example. @@ -115,7 +115,7 @@ in # This option is not used yet. mode = mkOption { default = "standalone"; - type = types.uniq types.string; + type = types.str; description = '' The MODE determines which part of the NUT is to be started, and which configuration files must be modified. @@ -142,7 +142,7 @@ in schedulerRules = mkOption { example = "/etc/nixos/upssched.conf"; - type = types.uniq types.string; + type = types.str; description = '' File which contains the rules to handle UPS events. ''; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 3603d677837..effd1a62bd9 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -50,7 +50,7 @@ in }; hostName = mkOption { - type = types.uniq types.string; + type = types.str; description = ''Host name advertised on the LAN.''; }; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index bfe7209b991..96396878afc 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -39,7 +39,7 @@ in }; netbios_hostname = mkOption { - type = types.uniq types.string; + type = types.str; description = '' The hostname of your machine. ''; diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix index 1b3473ee0ee..cd150fe63fd 100644 --- a/nixos/modules/services/networking/iodined.nix +++ b/nixos/modules/services/networking/iodined.nix @@ -32,21 +32,21 @@ in }; ip = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; description = "Assigned ip address or ip range"; example = "172.16.10.1/24"; }; domain = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; description = "Domain or subdomain of which nameservers point to us"; example = "tunnel.mydomain.com"; }; extraConfig = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; description = "Additional command line parameters"; example = "-P mysecurepassword -l 192.168.1.10 -p 23"; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 89c8687403b..5e5f81ed5a0 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -53,7 +53,7 @@ in }; driver = mkOption { - type = types.uniq types.string; + type = types.str; default = "nl80211,wext"; description = "Force a specific wpa_supplicant driver."; }; @@ -74,7 +74,7 @@ in }; group = mkOption { - type = types.uniq types.string; + type = types.str; default = "wheel"; example = "network"; description = "Members of this group can control wpa_supplicant."; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index e6a2437902c..9d345e30361 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -29,31 +29,31 @@ in { host = mkOption { description = "Elasticsearch listen address"; default = "127.0.0.1"; - type = types.uniq types.string; + type = types.str; }; port = mkOption { description = "Elasticsearch port to listen for HTTP traffic"; default = "9200"; - type = types.uniq types.string; + type = types.str; }; tcp_port = mkOption { description = "Elasticsearch port for the node to node communication"; default = "9300"; - type = types.uniq types.string; + type = types.str; }; cluster_name = mkOption { description = "Elasticsearch name that identifies your cluster for auto-discovery"; default = "elasticsearch"; - type = types.uniq types.string; + type = types.str; }; extraConf = mkOption { description = "Extra configuration for elasticsearch"; default = ""; - type = types.uniq types.string; + type = types.str; example = '' node.name: "elasticsearch" node.master: true @@ -77,7 +77,7 @@ in { type: consolePattern conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n" ''; - type = types.uniq types.string; + type = types.str; }; }; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index f9e40fc4b54..4cc34c65d84 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -102,7 +102,7 @@ in document-root = mkOption { default = "/srv/www"; - type = types.uniq types.string; + type = types.str; description = '' Document-root of the web server. Must be readable by the "lighttpd" user. ''; diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index d759d8144b6..f02bd4db264 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -25,7 +25,7 @@ in projectroot = mkOption { default = "/srv/git"; - type = types.uniq types.string; + type = types.str; description = '' Path to git projects (bare repositories) that should be served by gitweb. Must not end with a slash. @@ -34,7 +34,7 @@ in extraConfig = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; description = '' Verbatim configuration text appended to the generated gitweb.conf file. ''; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 3578d702b28..7bb2d769780 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -50,7 +50,7 @@ in }; default = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; example = "none"; description = "Default desktop manager loaded if none have been chosen."; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 91de910662f..65b634f9482 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -249,7 +249,7 @@ in }; execCmd = mkOption { - type = types.uniq types.string; + type = types.str; example = "${pkgs.slim}/bin/slim"; description = "Command to start the display manager."; }; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index e856a9e2079..fa06c4be264 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -40,7 +40,7 @@ in }; default = mkOption { - type = types.uniq types.string; + type = types.str; default = "none"; example = "wmii"; description = "Default window manager loaded if none have been chosen."; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 7b1c7d611d3..06b857297ac 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -155,7 +155,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; default = pkgs.stdenv.platform.kernelTarget; - type = types.uniq types.string; + type = types.str; description = '' Name of the kernel file to be passed to the bootloader. ''; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 31e55b5ef9f..947328c2ff6 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -65,7 +65,7 @@ in device = mkOption { default = ""; example = "/dev/hda"; - type = types.uniq types.string; + type = types.str; description = '' The device on which the GRUB boot loader will be installed. The special value nodev means that a GRUB @@ -89,7 +89,7 @@ in configurationName = mkOption { default = ""; example = "Stable 2.6.21"; - type = types.uniq types.string; + type = types.str; description = '' GRUB entry name instead of default. ''; diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index ff17535e418..0af4c9f7a58 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -52,7 +52,7 @@ in devSize = mkOption { default = "5%"; example = "32m"; - type = types.uniq types.string; + type = types.str; description = '' Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option, for the accepted syntax. @@ -62,7 +62,7 @@ in devShmSize = mkOption { default = "50%"; example = "256m"; - type = types.uniq types.string; + type = types.str; description = '' Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option, for the accepted syntax. @@ -72,7 +72,7 @@ in runSize = mkOption { default = "25%"; example = "256m"; - type = types.uniq types.string; + type = types.str; description = '' Size limit for the /run tmpfs. Look at mount(8), tmpfs size option, for the accepted syntax. diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index d18c5d86417..ac9e636fe1e 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -19,7 +19,7 @@ rec { description = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; description = "Description of this unit used in systemd messages and progress indicators."; }; @@ -167,13 +167,13 @@ rec { }; script = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; description = "Shell commands executed as the service's main process."; }; scriptArgs = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; description = "Arguments passed to the main process script."; }; @@ -230,7 +230,7 @@ rec { }; startAt = mkOption { - type = types.uniq types.string; + type = types.str; default = ""; example = "Sun 14:00:00"; description = '' @@ -296,13 +296,13 @@ rec { what = mkOption { example = "/dev/sda1"; - type = types.uniq types.string; + type = types.str; description = "Absolute path of device node, file or other resource. (Mandatory)"; }; where = mkOption { example = "/mnt"; - type = types.uniq types.string; + type = types.str; description = '' Absolute path of a directory of the mount point. Will be created if it doesn't exist. (Mandatory) @@ -312,7 +312,7 @@ rec { type = mkOption { default = ""; example = "ext4"; - type = types.uniq types.string; + type = types.str; description = "File system type."; }; @@ -340,7 +340,7 @@ rec { where = mkOption { example = "/mnt"; - type = types.uniq types.string; + type = types.str; description = '' Absolute path of a directory of the mount point. Will be created if it doesn't exist. (Mandatory) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 903ff4119e7..c1fb2c45165 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -389,7 +389,7 @@ in type = types.attrsOf types.optionSet; options = { text = mkOption { - type = types.uniq types.string; + type = types.str; description = "Text of this systemd unit."; }; enable = mkOption { @@ -473,7 +473,7 @@ in systemd.defaultUnit = mkOption { default = "multi-user.target"; - type = types.uniq types.string; + type = types.str; description = "Default unit started when the system boots."; }; @@ -488,13 +488,13 @@ in services.journald.console = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; description = "If non-empty, write log messages to the specified TTY device."; }; services.journald.rateLimitInterval = mkOption { default = "10s"; - type = types.uniq types.string; + type = types.str; description = '' Configures the rate limiting interval that is applied to all messages generated on the system. This rate limiting is applied @@ -518,7 +518,7 @@ in services.logind.extraConfig = mkOption { default = ""; - type = types.uniq types.string; + type = types.str; example = "HandleLidSwitch=ignore"; description = '' Extra config options for systemd-logind. See man logind.conf for diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix index 3b21d831087..8f441aa134d 100644 --- a/nixos/modules/tasks/cpu-freq.nix +++ b/nixos/modules/tasks/cpu-freq.nix @@ -10,7 +10,7 @@ with pkgs.lib; powerManagement.cpuFreqGovernor = mkOption { default = ""; example = "ondemand"; - type = types.uniq types.string; + type = types.str; description = '' Configure the governor used to regulate the frequence of the available CPUs. By default, the kernel configures the diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 2b4fe582c37..3f484045ed4 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -15,7 +15,7 @@ let mountPoint = mkOption { example = "/mnt/usb"; - type = types.uniq types.string; + type = types.str; description = "Location of the mounted the file system."; }; @@ -36,7 +36,7 @@ let fsType = mkOption { default = "auto"; example = "ext3"; - type = types.uniq types.string; + type = types.str; description = "Type of the file system."; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 796da3020ed..d8522b6abba 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -14,14 +14,14 @@ let name = mkOption { example = "eth0"; - type = types.uniq types.string; + type = types.str; description = "Name of the interface."; }; ipAddress = mkOption { default = null; example = "10.0.0.1"; - type = types.nullOr (types.uniq types.string); + type = types.nullOr (types.str); description = '' IP address of the interface. Leave empty to configure the interface using DHCP. @@ -41,7 +41,7 @@ let subnetMask = mkOption { default = ""; example = "255.255.255.0"; - type = types.uniq types.string; + type = types.str; description = '' Subnet mask of the interface, specified as a bitmask. This is deprecated; use @@ -52,7 +52,7 @@ let macAddress = mkOption { default = null; example = "00:11:22:33:44:55"; - type = types.nullOr (types.uniq types.string); + type = types.nullOr (types.str); description = '' MAC address of the interface. Leave empty to use the default. ''; @@ -72,7 +72,7 @@ let virtualOwner = mkOption { default = "root"; - type = types.uniq types.string; + type = types.str; description = '' In case of a virtual device, the user who owns it. ''; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 4ab67aee395..4927952080f 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -10,7 +10,7 @@ with pkgs.lib; powerManagement.scsiLinkPolicy = mkOption { default = ""; example = "min_power"; - type = types.uniq types.string; + type = types.str; description = '' Configure the SCSI link power management policy. By default, the kernel configures "max_performance". -- cgit 1.4.1