summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2021-05-05 03:31:41 +0200
committerSilvan Mosberger <contact@infinisil.com>2021-05-05 03:31:41 +0200
commit0a377f11a5dabcb5eb75adc9aa8b9b10f687a963 (patch)
treef3d222eae4965b735e3776694d21f1ea336c6ac1 /nixos
parent8b957e3b301d748e6fbbed806d82bd9d4b9d4ac4 (diff)
downloadnixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar.gz
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar.bz2
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar.lz
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar.xz
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.tar.zst
nixpkgs-0a377f11a5dabcb5eb75adc9aa8b9b10f687a963.zip
nixos/treewide: Remove usages of deprecated types.string
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/disnix.nix2
-rw-r--r--nixos/modules/services/monitoring/prometheus/default.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 41483d80a2d..aea49511327 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -37,7 +37,7 @@ in
       enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH";
 
       profiles = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "default" ];
         example = [ "default" ];
         description = "Names of the Disnix profiles to expose in the system's PATH";
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index bd74e1a9cdb..1d483627e9e 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -112,7 +112,7 @@ let
           http://tools.ietf.org/html/rfc4366#section-3.1
         '';
       };
-      name = mkOpt types.string ''
+      name = mkOpt types.str ''
         Name of the remote read config, which if specified must be unique among remote read configs.
         The name will be used in metrics and logging in place of a generated value to help users distinguish between
         remote read configs.
@@ -174,7 +174,7 @@ let
       write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) ''
         List of remote write relabel configurations.
       '';
-      name = mkOpt types.string ''
+      name = mkOpt types.str ''
         Name of the remote write config, which if specified must be unique among remote write configs.
         The name will be used in metrics and logging in place of a generated value to help users distinguish between
         remote write configs.