Merge master into staging-next (571f1c8b) · Commits · nix / nixpkgs

nixos/modules/services/monitoring/grafana.nix

+8 −0

Original line number	Diff line number	Diff line
		@@ -430,6 +430,12 @@ in
		type = types.path;
		};

		openFirewall = mkOption {
		type = types.bool;
		default = false;
		description = "Open the ports in the firewall for the server.";
		};

		settings = mkOption {
		description = ''
		Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
		@@ -2078,6 +2084,8 @@ in
		'';
		};

		networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.server.http_port ];

		users.users.grafana = {
		uid = config.ids.uids.grafana;
		description = "Grafana user";

nixos/modules/services/networking/kea.nix

+23 −17

Original line number	Diff line number	Diff line
		@@ -265,12 +265,24 @@ in

		config =
		let
		commonEnvironment = {
		KEA_CONTROL_SOCKET_DIR = "/run/kea";
		KEA_LOCKFILE_DIR = "/run/kea";
		KEA_PIDFILE_DIR = "/run/kea";
		};

		commonServiceConfig = {
		ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
		ExecReload = toString [
		(lib.getExe' pkgs.coreutils "kill")
		"-HUP"
		"$MAINPID"
		];
		DynamicUser = true;
		User = "kea";
		ConfigurationDirectory = "kea";
		Restart = "on-failure";
		RuntimeDirectory = "kea";
		RuntimeDirectoryMode = "0750";
		RuntimeDirectoryPreserve = true;
		StateDirectory = "kea";
		UMask = "0077";
		@@ -280,6 +292,12 @@ in
		lib.mkMerge [
		{
		environment.systemPackages = [ package ];

		users.users.kea = {
		isSystemUser = true;
		group = "kea";
		};
		users.groups.kea = { };
		}

		(lib.mkIf cfg.ctrl-agent.enable {
		@@ -312,10 +330,7 @@ in
		"kea-dhcp-ddns-server.service"
		];

		environment = {
		KEA_PIDFILE_DIR = "/run/kea";
		KEA_LOCKFILE_DIR = "/run/kea";
		};
		environment = commonEnvironment;

		restartTriggers = [
		ctrlAgentConfig
		@@ -358,10 +373,7 @@ in
		"multi-user.target"
		];

		environment = {
		KEA_PIDFILE_DIR = "/run/kea";
		KEA_LOCKFILE_DIR = "/run/kea";
		};
		environment = commonEnvironment;

		restartTriggers = [
		dhcp4Config
		@@ -411,10 +423,7 @@ in
		"multi-user.target"
		];

		environment = {
		KEA_PIDFILE_DIR = "/run/kea";
		KEA_LOCKFILE_DIR = "/run/kea";
		};
		environment = commonEnvironment;

		restartTriggers = [
		dhcp6Config
		@@ -460,10 +469,7 @@ in
		"multi-user.target"
		];

		environment = {
		KEA_PIDFILE_DIR = "/run/kea";
		KEA_LOCKFILE_DIR = "/run/kea";
		};
		environment = commonEnvironment;

		restartTriggers = [
		dhcpDdnsConfig

nixos/modules/services/security/kanidm.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -548,7 +548,7 @@ in
		description = "The redirect URL of the service. These need to exactly match the OAuth2 redirect target";
		type =
		let
		originStrType = types.strMatching ".://.$";
		originStrType = types.strMatching ".://?.$";
		in
		types.either originStrType (types.nonEmptyListOf originStrType);
		example = "https://someservice.example.com/auth/login";

nixos/modules/services/video/frigate.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -632,7 +632,8 @@ in
		serviceConfig = {
		ExecStartPre = [
		(pkgs.writeShellScript "frigate-clear-cache" ''
		rm --recursive --force /var/cache/frigate/*
		shopt -s extglob
		rm --recursive --force /var/cache/frigate/!(model_cache)
		'')
		(pkgs.writeShellScript "frigate-create-writable-config" ''
		cp --no-preserve=mode "${format.generate "frigate.yml" filteredConfig}" /run/frigate/frigate.yml

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -4576,8 +4576,8 @@ let
		mktplcRef = {
		name = "svelte-vscode";
		publisher = "svelte";
		version = "109.9.0";
		hash = "sha256-OgcFFYoJOtFVlOM12gYBG0AkliniawG6GdRtrFsjDIg=";
		version = "109.10.0";
		hash = "sha256-Rpzcf0ioM7faDWG1xcEuz6GNzU1lHZsGxGgaKwC8SKk=";
		};
		meta = {
		changelog = "https://github.com/sveltejs/language-tools/releases";