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

4 files changed, 10 insertions, 10 deletions

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index c3e39717258b..5570bb1adf6b 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 fb171050d3e8..65d7722abfa7 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 <varname>device</varname>.
             '';
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index e185584846a7..07a76d9ad1fa 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 5f32dc350dfc..383f87120e08 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.";
       };