summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorLin Jian <me@linj.tech>2023-08-08 20:45:53 +0800
committerLin Jian <me@linj.tech>2023-08-08 21:31:21 +0800
commit74fadae9421bf39b740c5c6a5fe26e7667627840 (patch)
tree0c20a27434937e7feb8176f969ee1227bdfe245b /nixos/modules/services
parent4e6868b1aa3766ab1de169922bb3826143941973 (diff)
downloadnixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar.gz
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar.bz2
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar.lz
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar.xz
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.tar.zst
nixpkgs-74fadae9421bf39b740c5c6a5fe26e7667627840.zip
treewide: stop using types.string
It is an error[1] now.

[1]: https://github.com/NixOS/nixpkgs/pull/247848
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/cluster/patroni/default.nix2
-rw-r--r--nixos/modules/services/hardware/keyd.nix2
-rw-r--r--nixos/modules/services/mail/maddy.nix8
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/cluster/patroni/default.nix b/nixos/modules/services/cluster/patroni/default.nix
index 9bf3a285836..5ab016a9f59 100644
--- a/nixos/modules/services/cluster/patroni/default.nix
+++ b/nixos/modules/services/cluster/patroni/default.nix
@@ -105,7 +105,7 @@ in
     };
 
     otherNodesIps = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = [ "192.168.1.2" "192.168.1.3" ];
       description = mdDoc ''
         IP addresses of the other nodes.
diff --git a/nixos/modules/services/hardware/keyd.nix b/nixos/modules/services/hardware/keyd.nix
index 969383fd4dc..ead2f456a20 100644
--- a/nixos/modules/services/hardware/keyd.nix
+++ b/nixos/modules/services/hardware/keyd.nix
@@ -7,7 +7,7 @@ let
   keyboardOptions = { ... }: {
     options = {
       ids = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "*" ];
         example = [ "*" "-0123:0456" ];
         description = lib.mdDoc ''
diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix
index 3b4a517fb85..2c4d75e8391 100644
--- a/nixos/modules/services/mail/maddy.nix
+++ b/nixos/modules/services/mail/maddy.nix
@@ -142,7 +142,7 @@ in {
 
       user = mkOption {
         default = "maddy";
-        type = with types; uniq string;
+        type = with types; uniq str;
         description = lib.mdDoc ''
           User account under which maddy runs.
 
@@ -156,7 +156,7 @@ in {
 
       group = mkOption {
         default = "maddy";
-        type = with types; uniq string;
+        type = with types; uniq str;
         description = lib.mdDoc ''
           Group account under which maddy runs.
 
@@ -170,7 +170,7 @@ in {
 
       hostname = mkOption {
         default = "localhost";
-        type = with types; uniq string;
+        type = with types; uniq str;
         example = ''example.com'';
         description = lib.mdDoc ''
           Hostname to use. It should be FQDN.
@@ -179,7 +179,7 @@ in {
 
       primaryDomain = mkOption {
         default = "localhost";
-        type = with types; uniq string;
+        type = with types; uniq str;
         example = ''mail.example.com'';
         description = lib.mdDoc ''
           Primary MX domain to use. It should be FQDN.