From 11681612c37d3d08324d7f249613b48fdf7a5239 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 24 Feb 2025 22:16:44 +0100 Subject: [PATCH] chore: lib.types.string -> lib.types.str lib.types.string concatenates conflicting definitions on module merge which is counter intuitive and hard to debug behavior. Change-Id: I8ccdca0e8895fb5cc4600c367f8d52a9ab80ff75 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13177 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: aspen --- ops/modules/builderball.nix | 2 +- ops/modules/prometheus-fail2ban-exporter.nix | 2 +- users/aspen/xanthous/server/module.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ops/modules/builderball.nix b/ops/modules/builderball.nix index 9c416affc..9b77e893e 100644 --- a/ops/modules/builderball.nix +++ b/ops/modules/builderball.nix @@ -14,7 +14,7 @@ in enable = lib.mkEnableOption description; caches = lib.mkOption { - type = with lib.types; listOf string; + type = with lib.types; listOf str; description = "Public addresses of caches to use"; default = [ diff --git a/ops/modules/prometheus-fail2ban-exporter.nix b/ops/modules/prometheus-fail2ban-exporter.nix index 349364f9b..504b7e5dc 100644 --- a/ops/modules/prometheus-fail2ban-exporter.nix +++ b/ops/modules/prometheus-fail2ban-exporter.nix @@ -10,7 +10,7 @@ in interval = mkOption { description = "Systemd calendar expression for how often to run the interval"; - type = types.string; + type = types.str; default = "minutely"; example = "hourly"; }; diff --git a/users/aspen/xanthous/server/module.nix b/users/aspen/xanthous/server/module.nix index 6d1bdc687..8950f2e8d 100644 --- a/users/aspen/xanthous/server/module.nix +++ b/users/aspen/xanthous/server/module.nix @@ -27,7 +27,7 @@ in }; ed25519SecretKeyFile = mkOption { - type = with types; uniq string; + type = with types; uniq str; description = "Path to the ed25519 secret key for the server"; }; };