summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-09-01 10:10:15 +0200
committerGitHub <noreply@github.com>2019-09-01 10:10:15 +0200
commitd6a3aead1548e3f43f2a8d40efefaef8a4396c92 (patch)
tree8beff1effbb86ba91fa81b0bd1eb64d818cbf0df /modules
parentbe7f25b3f9b1a72e41f16f82344dbfbe0b48f39f (diff)
parent2807a31f95f3c4b399839dffe056c63bb7b3ae2f (diff)
Merge pull request #159 from marsam/remove-types-string
modules: remove usages of types.string
Diffstat (limited to 'modules')
-rw-r--r--modules/services/autossh.nix6
-rw-r--r--modules/services/hercules-ci-agent/default.nix2
-rw-r--r--modules/services/postgresql/default.nix2
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/services/autossh.nix b/modules/services/autossh.nix
index 8c5cd5c..2df74ec 100644
--- a/modules/services/autossh.nix
+++ b/modules/services/autossh.nix
@@ -20,12 +20,12 @@ in
type = types.listOf (types.submodule {
options = {
name = mkOption {
- type = types.string;
+ type = types.str;
example = "socks-peer";
description = "Name of the local AutoSSH session";
};
user = mkOption {
- type = types.string;
+ type = types.str;
example = "bill";
description = "Name of the user the AutoSSH session should run as";
};
@@ -40,7 +40,7 @@ in
'';
};
extraArguments = mkOption {
- type = types.string;
+ type = types.str;
example = "-N -D4343 bill@socks.example.net";
description = ''
Arguments to be passed to AutoSSH and retransmitted to SSH
diff --git a/modules/services/hercules-ci-agent/default.nix b/modules/services/hercules-ci-agent/default.nix
index fe43ec7..56e69b3 100644
--- a/modules/services/hercules-ci-agent/default.nix
+++ b/modules/services/hercules-ci-agent/default.nix
@@ -17,7 +17,7 @@ in {
description = "Alternative base URL for the Hercules API";
example = "https://hercules-ci.com";
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
};
clusterJoinTokenPath = mkOption {
diff --git a/modules/services/postgresql/default.nix b/modules/services/postgresql/default.nix
index 35a4aed..a17ef3b 100644
--- a/modules/services/postgresql/default.nix
+++ b/modules/services/postgresql/default.nix
@@ -62,7 +62,7 @@ in
};
characterSet = mkOption {
- type = types.string;
+ type = types.str;
default = "UTF8";
example = "SJIS";
description = ''Character set specified during initialization'';