Merge staging-next into staging (85b58728) · Commits · nix / nixpkgs

ci/github-script/labels.js

+3 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,9 @@ module.exports = async ({ github, context, core, dry }) => {
		'assigned',
		'commented', // uses updated_at, because that could be > created_at
		'committed', // uses committer.date
		...(item.labels.some(({ name }) => name === '5.scope: tracking')
		? ['cross-referenced']
		: []),
		'head_ref_force_pushed',
		'milestoned',
		'pinned',

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ in
		Additional config entries for the fw-fanctrl service (documentation: <https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md>)
		'';
		type = lib.types.submodule {
		freeformType = configFormat.type;
		freeformType = lib.types.attrsOf configFormat.type;
		options = {
		defaultStrategy = lib.mkOption {
		type = lib.types.str;

+8 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,12 @@ let
		options
		lists
		;
		inherit (lib.types) bool submodule ints;
		inherit (lib.types)
		bool
		submodule
		ints
		attrsOf
		;
		in
		{
		options.programs.openvpn3 = {
		@@ -33,7 +38,7 @@ in
		description = "Options stored in {file}`/etc/openvpn3/netcfg.json` configuration file";
		default = { };
		type = submodule {
		freeformType = json.type;
		freeformType = attrsOf json.type;
		options = {
		systemd_resolved = mkOption {
		type = bool;
		@@ -57,7 +62,7 @@ in
		description = "Options stored in {file}`/etc/openvpn3/log-service.json` configuration file";
		default = { };
		type = submodule {
		freeformType = json.type;
		freeformType = attrsOf json.type;
		options = {
		journald = mkOption {
		description = "Use systemd-journald";

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ let
		inherit (lib) types mkOption;
		in
		types.submodule {
		freeformType = format.type;
		freeformType = types.attrsOf format.type;

		options = {
		email = mkOption {
		@@ -53,7 +53,7 @@ let
		inherit (lib) types literalExpression mkOption;
		in
		types.submodule {
		freeformType = format.type;
		freeformType = types.attrsOf format.type;

		options = {
		domains = mkOption {
		@@ -91,7 +91,7 @@ in
		settings = mkOption {
		description = "Settings";
		type = types.submodule {
		freeformType = format.type;
		freeformType = types.attrsOf format.type;

		options = {
		dns_listen_addr = mkOption {

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ with lib;
		- [Old homepage with documentation link](https://www.meshcommander.com/meshcentral2)
		'';
		type = types.submodule {
		freeformType = configFormat.type;
		freeformType = attrsOf configFormat.type;
		};
		example = {
		settings = {