summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/Reaktor.nix4
-rw-r--r--krebs/3modules/charybdis.nix8
-rw-r--r--krebs/3modules/rtorrent.nix2
-rw-r--r--krebs/3modules/tinc.nix2
m---------submodules/krops0
5 files changed, 8 insertions, 8 deletions
diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
index 308c6d41d..2a035d7be 100644
--- a/krebs/3modules/Reaktor.nix
+++ b/krebs/3modules/Reaktor.nix
@@ -17,7 +17,7 @@ let
nickname = mkOption {
default = config.krebs.build.host.name + "|r";
- type = types.string;
+ type = types.str;
description = ''
The nick name of the irc bot.
Defaults to {hostname}|r
@@ -47,7 +47,7 @@ let
extraConfig = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
configuration appended to the default or overridden configuration
'';
diff --git a/krebs/3modules/charybdis.nix b/krebs/3modules/charybdis.nix
index f4a7c1313..aa7c980c5 100644
--- a/krebs/3modules/charybdis.nix
+++ b/krebs/3modules/charybdis.nix
@@ -21,14 +21,14 @@ in
enable = mkEnableOption "Charybdis IRC daemon";
config = mkOption {
- type = types.string;
+ type = types.str;
description = ''
Charybdis IRC daemon configuration file.
'';
};
statedir = mkOption {
- type = types.string;
+ type = types.str;
default = "/var/lib/charybdis";
description = ''
Location of the state directory of charybdis.
@@ -36,7 +36,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon user.
@@ -44,7 +44,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon group.
diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index 1f88a49e1..11f5b1407 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -186,7 +186,7 @@ let
};
extraConfig = mkOption {
- type = types.string;
+ type = types.str;
description = ''
config to be placed into ${cfg.workDir}/.rtorrent.rc
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index ed00d187c..8b6e959d4 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -63,7 +63,7 @@ let
'';
};
tincUp = mkOption {
- type = types.string;
+ type = types.str;
default = let
net = tinc.config.host.nets.${netname};
iproute = tinc.config.iproutePackage;
diff --git a/submodules/krops b/submodules/krops
-Subproject f2f8cbf1afcb2c26d11e5f82c0b523b2cb10205
+Subproject f1b7112ac3cbe090e96f2c82c525b6db69b8203