From 2807a31f95f3c4b399839dffe056c63bb7b3ae2f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Aug 2019 04:20:00 -0500
Subject: [PATCH] modules: remove usages of types.string
---
modules/services/autossh.nix | 6 +++---
modules/services/hercules-ci-agent/default.nix | 2 +-
modules/services/postgresql/default.nix | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/services/autossh.nix b/modules/services/autossh.nix
index 8c5cd5cc..2df74ec6 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 fe43ec7e..56e69b36 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 35a4aed0..a17ef3b9 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'';