···11{
22 config,
33 lib,
44- options,
54 pkgs,
65 ...
77-}: # XXX migration code for freeform settings: `options` can be removed in 2025
88-let
99- optionsGlobal = options;
1010-in
66+}:
117128let
139···7571 {
7672 freeformType = attrsOf (either scalarType (listOf scalarType));
7773 # Client system-options file directives are explained here:
7878- # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options
7474+ # https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=commands-processing-options
7975 options.servername = mkOption {
8076 type = servernameType;
8177 default = name;
···150146 };
151147 config.commmethod = mkDefault "v6tcpip"; # uses v4 or v6, based on dns lookup result
152148 config.passwordaccess = if config.genPasswd then "generate" else "prompt";
153153- # XXX migration code for freeform settings, these can be removed in 2025:
154154- options.warnings = optionsGlobal.warnings;
155155- options.assertions = optionsGlobal.assertions;
156156- imports =
157157- let
158158- inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule;
159159- in
160160- [
161161- (mkRemovedOptionModule [ "extraConfig" ]
162162- "Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
163163- )
164164- (mkRemovedOptionModule [ "text" ]
165165- "Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
166166- )
167167- (mkRenamedOptionModule [ "name" ] [ "servername" ])
168168- (mkRenamedOptionModule [ "server" ] [ "tcpserveraddress" ])
169169- (mkRenamedOptionModule [ "port" ] [ "tcpport" ])
170170- (mkRenamedOptionModule [ "node" ] [ "nodename" ])
171171- (mkRenamedOptionModule [ "passwdDir" ] [ "passworddir" ])
172172- (mkRenamedOptionModule [ "includeExclude" ] [ "inclexcl" ])
173173- ];
174149 };
175150176151 options.programs.tsmClient = {
···291266 contain duplicate names
292267 (note that setting names are case insensitive).
293268 '';
294294- }) cfg.servers)
295295- # XXX migration code for freeform settings, this can be removed in 2025:
296296- ++ (enrichMigrationInfos "assertions" (
297297- addText:
298298- { assertion, message }:
299299- {
300300- inherit assertion;
301301- message = addText message;
302302- }
303303- ));
269269+ }) cfg.servers);
304270305271 makeDsmSysLines =
306272 key: value:
···340306 attrs = removeAttrs serverCfg [
341307 "servername"
342308 "genPasswd"
343343- # XXX migration code for freeform settings, these can be removed in 2025:
344344- "assertions"
345345- "warnings"
346346- "extraConfig"
347347- "text"
348348- "name"
349349- "server"
350350- "port"
351351- "node"
352352- "passwdDir"
353353- "includeExclude"
354309 ];
355310 in
356311 ''
···369324 ${concatLines (map makeDsmSysStanza (attrValues cfg.servers))}
370325 '';
371326372372- # XXX migration code for freeform settings, this can be removed in 2025:
373373- enrichMigrationInfos =
374374- what: how:
375375- concatLists (
376376- mapAttrsToList (
377377- name: serverCfg:
378378- map (how (text: "In `programs.tsmClient.servers.${name}`: ${text}")) serverCfg."${what}"
379379- ) cfg.servers
380380- );
381381-382327in
383328384329{
···393338 dsmSysApi = dsmSysCli;
394339 };
395340 environment.systemPackages = [ cfg.wrappedPackage ];
396396- # XXX migration code for freeform settings, this can be removed in 2025:
397397- warnings = enrichMigrationInfos "warnings" (addText: addText);
398341 };
399342400343 meta.maintainers = [ lib.maintainers.yarny ];
+1-1
nixos/modules/services/backup/tsm.nix
···8989 environment.HOME = "/var/lib/tsm-backup";
9090 serviceConfig = {
9191 # for exit status description see
9292- # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes
9292+ # https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=clients-client-return-codes
9393 SuccessExitStatus = "4 8";
9494 # The `-se` option must come after the command.
9595 # The `-optfile` option suppresses a `dsm.opt`-not-found warning.
+33-2
nixos/modules/services/web-apps/peertube.nix
···165165 };
166166167167 settings = lib.mkOption {
168168- type = settingsFormat.type;
168168+ type = lib.types.submodule (
169169+ { config, ... }:
170170+ {
171171+ freeformType = settingsFormat.type;
172172+ options = {
173173+ video_transcription = {
174174+ enabled = lib.mkOption {
175175+ type = lib.types.bool;
176176+ default = false;
177177+ description = "Enable automatic transcription of videos.";
178178+ };
179179+ engine_path = lib.mkOption {
180180+ type = with lib.types; either path str;
181181+ default =
182182+ if config.video_transcription.enabled then
183183+ lib.getExe pkgs.whisper-ctranslate2
184184+ else
185185+ # This will be in the error message when someone enables
186186+ # transcription manually in the web UI and tries to run a
187187+ # transcription job.
188188+ "Set `services.peertube.settings.video_transcription.enabled = true`.";
189189+ defaultText = lib.literalExpression ''
190190+ if config.services.peertube.settings.video_transcription.enabled then
191191+ lib.getExe pkgs.whisper-ctranslate2
192192+ else
193193+ "Set `services.peertube.settings.video_transcription.enabled = true`."
194194+ '';
195195+ description = "Custom engine path for local transcription.";
196196+ };
197197+ };
198198+ };
199199+ }
200200+ );
169201 example = lib.literalExpression ''
170202 {
171203 listen = {
···424456 };
425457 video_transcription = {
426458 engine = lib.mkDefault "whisper-ctranslate2";
427427- engine_path = lib.mkDefault (lib.getExe pkgs.whisper-ctranslate2);
428459 };
429460 }
430461 (lib.mkIf cfg.redis.enableUnixSocket {
+8-8
pkgs/applications/editors/vscode/vscode.nix
···36363737 hash =
3838 {
3939- x86_64-linux = "sha256-zgrNohvsmhcRQmkX7Io2/U3qbVWdcqwT7VK7Y3ENb9g=";
4040- x86_64-darwin = "sha256-depSpPZm6bMQv9yvLUJ6yacCwTDtcpoFu15b67oiFJY=";
4141- aarch64-linux = "sha256-Fo2X4VAWcyySQ+CE/bt+lJneLoEKVl6tLwPSW5LwvFY=";
4242- aarch64-darwin = "sha256-WdYmlopeVsFCndnTALKiQgx2O4zzkDtotR/qj7A56bY=";
4343- armv7l-linux = "sha256-OF4qjhgQiagpQP8p9gV63I/B8s/CSl8KlA+FoNhl3/c=";
3939+ x86_64-linux = "sha256-rUAu69aUjLQsDT5hK8E5yWiMdVfNFqwx9aA8op1ZYj8=";
4040+ x86_64-darwin = "sha256-BOrLjZsA9QFtcsvgsohZbCRRRqTHhn043HHIpl40kPA=";
4141+ aarch64-linux = "sha256-DBthRZDeJF6xksMWGvXIC7vdTkQCyjt+oHUI+FbLBrU=";
4242+ aarch64-darwin = "sha256-TWa2jMRBR0a0SOUkrnZw6Ej3cRGdZd0Gw5Obt11M45k=";
4343+ armv7l-linux = "sha256-SYrXdEzIYG/2ih3vqCTfIo+6jTvMJe+rIOzNQXfd+es=";
4444 }
4545 .${system} or throwSystem;
4646in
4747callPackage ./generic.nix rec {
4848 # Please backport all compatible updates to the stable release.
4949 # This is important for the extension ecosystem.
5050- version = "1.102.0";
5050+ version = "1.102.1";
5151 pname = "vscode" + lib.optionalString isInsiders "-insiders";
52525353 # This is used for VS Code - Remote SSH test
5454- rev = "cb0c47c0cfaad0757385834bd89d410c78a856c0";
5454+ rev = "7adae6a56e34cb64d08899664b814cf620465925";
55555656 executableName = "code" + lib.optionalString isInsiders "-insiders";
5757 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
···7575 src = fetchurl {
7676 name = "vscode-server-${rev}.tar.gz";
7777 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
7878- hash = "sha256-Hf/pukcQf7PaHORItWO74gC54TWto+nHiKaCHzD0TmI=";
7878+ hash = "sha256-EP5xCkCSMROB60OmDFWVWF9qHqW8pjKWPh6mSUU5E7A=";
7979 };
8080 stdenv = stdenvNoCC;
8181 };
+2-2
pkgs/by-name/aw/awscli2/package.nix
···6565in
6666py.pkgs.buildPythonApplication rec {
6767 pname = "awscli2";
6868- version = "2.27.49"; # N.B: if you change this, check if overrides are still up-to-date
6868+ version = "2.27.50"; # N.B: if you change this, check if overrides are still up-to-date
6969 pyproject = true;
70707171 src = fetchFromGitHub {
7272 owner = "aws";
7373 repo = "aws-cli";
7474 tag = version;
7575- hash = "sha256-fg4UMAsylJJ0Xy8s84Qr7OdiFrzMIP9RsAH+pYDThrU=";
7575+ hash = "sha256-ITiZ144YFhwuRcfhulLF0jxpp1OgznEE8frx4Yn4V+A=";
7676 };
77777878 postPatch = ''