public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-05 12:23:47 +00:00
committed by GitHub
parent dbc1478d23 3c0b6baf47
commit af9d9374fa
18 changed files with 480 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/misc/disnix.nix
+1 -1
View File
@@ -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";
nixos/modules/services/monitoring/prometheus/default.nix
+2 -2
View File
@@ -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.