Substitute "types.uniq types.string" -> "types.str"

19 files changed, 52 insertions, 52 deletions

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
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
@@ -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 <filename>nix-collect-garbage</filename> 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.";