diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-05-05 11:13:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 11:13:37 +0200 |
| commit | ce93c98ce2243a8228419fcfbe97fd87f3c5f99e (patch) | |
| tree | 49ffb41bb33eec1ff38ebafab99d386e12cf7286 /nixos | |
| parent | 4a97e2669584a9f4362e074f8e1f2d6b333c8f66 (diff) | |
| parent | 0a377f11a5dabcb5eb75adc9aa8b9b10f687a963 (diff) | |
| download | nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar.gz nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar.bz2 nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar.lz nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar.xz nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.tar.zst nixlib-ce93c98ce2243a8228419fcfbe97fd87f3c5f99e.zip | |
Merge pull request #99132 from Infinisil/recursive-type-deprecation
Recursive type deprecation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/disnix.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 41483d80a2dd..aea49511327d 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 bd74e1a9cdb5..1d483627e9e2 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. |