Merge master into staging-next (406696e0) · Commits · nix / nixpkgs

nixos/modules/programs/tsm-client.nix

+3 −60

Original line number	Diff line number	Diff line
		{
		config,
		lib,
		options,
		pkgs,
		...
		}: # XXX migration code for freeform settings: `options` can be removed in 2025
		let
		optionsGlobal = options;
		in
		}:

		let

		@@ -75,7 +71,7 @@ let
		{
		freeformType = attrsOf (either scalarType (listOf scalarType));
		# Client system-options file directives are explained here:
		# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options
		# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=commands-processing-options
		options.servername = mkOption {
		type = servernameType;
		default = name;
		@@ -150,27 +146,6 @@ let
		};
		config.commmethod = mkDefault "v6tcpip"; # uses v4 or v6, based on dns lookup result
		config.passwordaccess = if config.genPasswd then "generate" else "prompt";
		# XXX migration code for freeform settings, these can be removed in 2025:
		options.warnings = optionsGlobal.warnings;
		options.assertions = optionsGlobal.assertions;
		imports =
		let
		inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule;
		in
		[
		(mkRemovedOptionModule [ "extraConfig" ]
		"Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
		)
		(mkRemovedOptionModule [ "text" ]
		"Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
		)
		(mkRenamedOptionModule [ "name" ] [ "servername" ])
		(mkRenamedOptionModule [ "server" ] [ "tcpserveraddress" ])
		(mkRenamedOptionModule [ "port" ] [ "tcpport" ])
		(mkRenamedOptionModule [ "node" ] [ "nodename" ])
		(mkRenamedOptionModule [ "passwdDir" ] [ "passworddir" ])
		(mkRenamedOptionModule [ "includeExclude" ] [ "inclexcl" ])
		];
		};

		options.programs.tsmClient = {
		@@ -291,16 +266,7 @@ let
		contain duplicate names
		(note that setting names are case insensitive).
		'';
		}) cfg.servers)
		# XXX migration code for freeform settings, this can be removed in 2025:
		++ (enrichMigrationInfos "assertions" (
		addText:
		{ assertion, message }:
		{
		inherit assertion;
		message = addText message;
		}
		));
		}) cfg.servers);

		makeDsmSysLines =
		key: value:
		@@ -340,17 +306,6 @@ let
		attrs = removeAttrs serverCfg [
		"servername"
		"genPasswd"
		# XXX migration code for freeform settings, these can be removed in 2025:
		"assertions"
		"warnings"
		"extraConfig"
		"text"
		"name"
		"server"
		"port"
		"node"
		"passwdDir"
		"includeExclude"
		];
		in
		''
		@@ -369,16 +324,6 @@ let
		${concatLines (map makeDsmSysStanza (attrValues cfg.servers))}
		'';

		# XXX migration code for freeform settings, this can be removed in 2025:
		enrichMigrationInfos =
		what: how:
		concatLists (
		mapAttrsToList (
		name: serverCfg:
		map (how (text: "In `programs.tsmClient.servers.${name}`: ${text}")) serverCfg."${what}"
		) cfg.servers
		);

		in

		{
		@@ -393,8 +338,6 @@ in
		dsmSysApi = dsmSysCli;
		};
		environment.systemPackages = [ cfg.wrappedPackage ];
		# XXX migration code for freeform settings, this can be removed in 2025:
		warnings = enrichMigrationInfos "warnings" (addText: addText);
		};

		meta.maintainers = [ lib.maintainers.yarny ];

nixos/modules/services/backup/tsm.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ in
		environment.HOME = "/var/lib/tsm-backup";
		serviceConfig = {
		# for exit status description see
		# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes
		# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=clients-client-return-codes
		SuccessExitStatus = "4 8";
		# The `-se` option must come after the command.
		# The `-optfile` option suppresses a `dsm.opt`-not-found warning.

nixos/modules/services/web-apps/peertube.nix

+33 −2

Original line number	Diff line number	Diff line
		@@ -165,7 +165,39 @@ in
		};

		settings = lib.mkOption {
		type = settingsFormat.type;
		type = lib.types.submodule (
		{ config, ... }:
		{
		freeformType = settingsFormat.type;
		options = {
		video_transcription = {
		enabled = lib.mkOption {
		type = lib.types.bool;
		default = false;
		description = "Enable automatic transcription of videos.";
		};
		engine_path = lib.mkOption {
		type = with lib.types; either path str;
		default =
		if config.video_transcription.enabled then
		lib.getExe pkgs.whisper-ctranslate2
		else
		# This will be in the error message when someone enables
		# transcription manually in the web UI and tries to run a
		# transcription job.
		"Set `services.peertube.settings.video_transcription.enabled = true`.";
		defaultText = lib.literalExpression ''
		if config.services.peertube.settings.video_transcription.enabled then
		lib.getExe pkgs.whisper-ctranslate2
		else
		"Set `services.peertube.settings.video_transcription.enabled = true`."
		'';
		description = "Custom engine path for local transcription.";
		};
		};
		};
		}
		);
		example = lib.literalExpression ''
		{
		listen = {
		@@ -424,7 +456,6 @@ in
		};
		video_transcription = {
		engine = lib.mkDefault "whisper-ctranslate2";
		engine_path = lib.mkDefault (lib.getExe pkgs.whisper-ctranslate2);
		};
		}
		(lib.mkIf cfg.redis.enableUnixSocket {

pkgs/applications/editors/vscode/vscode.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -36,22 +36,22 @@ let

		hash =
		{
		x86_64-linux = "sha256-zgrNohvsmhcRQmkX7Io2/U3qbVWdcqwT7VK7Y3ENb9g=";
		x86_64-darwin = "sha256-depSpPZm6bMQv9yvLUJ6yacCwTDtcpoFu15b67oiFJY=";
		aarch64-linux = "sha256-Fo2X4VAWcyySQ+CE/bt+lJneLoEKVl6tLwPSW5LwvFY=";
		aarch64-darwin = "sha256-WdYmlopeVsFCndnTALKiQgx2O4zzkDtotR/qj7A56bY=";
		armv7l-linux = "sha256-OF4qjhgQiagpQP8p9gV63I/B8s/CSl8KlA+FoNhl3/c=";
		x86_64-linux = "sha256-rUAu69aUjLQsDT5hK8E5yWiMdVfNFqwx9aA8op1ZYj8=";
		x86_64-darwin = "sha256-BOrLjZsA9QFtcsvgsohZbCRRRqTHhn043HHIpl40kPA=";
		aarch64-linux = "sha256-DBthRZDeJF6xksMWGvXIC7vdTkQCyjt+oHUI+FbLBrU=";
		aarch64-darwin = "sha256-TWa2jMRBR0a0SOUkrnZw6Ej3cRGdZd0Gw5Obt11M45k=";
		armv7l-linux = "sha256-SYrXdEzIYG/2ih3vqCTfIo+6jTvMJe+rIOzNQXfd+es=";
		}
		.${system} or throwSystem;
		in
		callPackage ./generic.nix rec {
		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.102.0";
		version = "1.102.1";
		pname = "vscode" + lib.optionalString isInsiders "-insiders";

		# This is used for VS Code - Remote SSH test
		rev = "cb0c47c0cfaad0757385834bd89d410c78a856c0";
		rev = "7adae6a56e34cb64d08899664b814cf620465925";

		executableName = "code" + lib.optionalString isInsiders "-insiders";
		longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
		@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
		src = fetchurl {
		name = "vscode-server-${rev}.tar.gz";
		url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
		hash = "sha256-Hf/pukcQf7PaHORItWO74gC54TWto+nHiKaCHzD0TmI=";
		hash = "sha256-EP5xCkCSMROB60OmDFWVWF9qHqW8pjKWPh6mSUU5E7A=";
		};
		stdenv = stdenvNoCC;
		};

pkgs/by-name/aw/awscli2/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,14 +65,14 @@ let
		in
		py.pkgs.buildPythonApplication rec {
		pname = "awscli2";
		version = "2.27.49"; # N.B: if you change this, check if overrides are still up-to-date
		version = "2.27.50"; # N.B: if you change this, check if overrides are still up-to-date
		pyproject = true;

		src = fetchFromGitHub {
		owner = "aws";
		repo = "aws-cli";
		tag = version;
		hash = "sha256-fg4UMAsylJJ0Xy8s84Qr7OdiFrzMIP9RsAH+pYDThrU=";
		hash = "sha256-ITiZ144YFhwuRcfhulLF0jxpp1OgznEE8frx4Yn4V+A=";
		};

		postPatch = ''