From 2ad8bf20edd3a4dffb834f38ae370f90877721bd Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 27 Mar 2026 18:58:22 +0100 Subject: [PATCH] tsm-client: 8.1.27.1 -> 8.2.1.0 Release notes ("What's new"): https://www.ibm.com/docs/en/storage-protect/8.2.1?topic=whats-new#r_wn_tsmserver__title__3 The package now needs `brotli` and `libnghttp2`. Unfortunatelly, the vm test's OCR no longer recognizes the version number in the information dialog box (it sees "8.21.0" instead of "8.2.1.0"). I don't think relaxing that test makes any sense, as OCR might fail in a million different ways. So I just remove the version number check from the test. --- nixos/modules/programs/tsm-client.nix | 2 +- nixos/modules/services/backup/tsm.nix | 2 +- nixos/tests/tsm-client-gui.nix | 1 - pkgs/by-name/ts/tsm-client/package.nix | 10 +++++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index 8765c809fd1a..142fd9256045 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -71,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.27?topic=commands-processing-options + # https://www.ibm.com/docs/en/storage-protect/8.2.1?topic=utilities-processing-options options.servername = mkOption { type = servernameType; default = name; diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix index 7322f6175064..d2c9afd55f84 100644 --- a/nixos/modules/services/backup/tsm.nix +++ b/nixos/modules/services/backup/tsm.nix @@ -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.27?topic=clients-client-return-codes + # https://www.ibm.com/docs/en/storage-protect/8.2.1?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. diff --git a/nixos/tests/tsm-client-gui.nix b/nixos/tests/tsm-client-gui.nix index 7e3dbb6f116a..953fb91b6336 100644 --- a/nixos/tests/tsm-client-gui.nix +++ b/nixos/tests/tsm-client-gui.nix @@ -51,7 +51,6 @@ # "Connection Information" dialog box machine.wait_for_window("Connection Information") machine.wait_for_text("SOME-NODE") - machine.wait_for_text("${pkgs.tsm-client.passthru.unwrapped.version}") machine.shutdown() ''; diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix index 25cc4b8cdf18..c8ea3e004466 100644 --- a/pkgs/by-name/ts/tsm-client/package.nix +++ b/pkgs/by-name/ts/tsm-client/package.nix @@ -6,6 +6,8 @@ fetchurl, autoPatchelfHook, rpmextract, + brotli, + libnghttp2, libxcrypt-legacy, zlib, lvm2, # LVM image backup and restore functions (optional) @@ -44,7 +46,7 @@ # point to this derivations `/dsmi_dir` directory symlink. # Other environment variables might be necessary, # depending on local configuration or usage; see: -# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=solaris-set-api-environment-variables +# https://www.ibm.com/docs/en/storage-protect/8.2.1?topic=solaris-set-api-environment-variables let @@ -91,10 +93,10 @@ let unwrapped = stdenv.mkDerivation (finalAttrs: { pname = "tsm-client-unwrapped"; - version = "8.1.27.1"; + version = "8.2.1.0"; src = fetchurl { url = mkSrcUrl finalAttrs.version; - hash = "sha512-s7arnrbZoNvU3NX53coD8ugw7+cJQswWX0qctVZqWcSHN0FgexXYmRq3kt90KfjShMjcOGAHJhqCKKmukbIYjg=="; + hash = "sha512-Hlm4sk78I/+hVKwGsSDpwIihMqMeAlLtu4H/DLo2NVNMQnixZTYRch69hAR1PNaSS7qz8/oiI51AYTc6+JYdtA=="; }; inherit meta passthru; @@ -103,6 +105,8 @@ let rpmextract ]; buildInputs = [ + brotli + libnghttp2 libxcrypt-legacy stdenv.cc.cc zlib