summary refs log tree commit diff
diff options
context:
space:
mode:
authorYarny0 <41838844+Yarny0@users.noreply.github.com>2022-10-17 01:31:05 +0200
committerGitHub <noreply@github.com>2022-10-17 01:31:05 +0200
commitcce8f0a3e32ce7fc2a4942a72bed65716e95f5fd (patch)
tree0fe893d01816a8b053e9302ebbde62aa18ca63cc
parentf10c7ab76e261c08869cb82152a54c35b9ec219b (diff)
downloadnixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar.gz
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar.bz2
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar.lz
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar.xz
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.tar.zst
nixpkgs-cce8f0a3e32ce7fc2a4942a72bed65716e95f5fd.zip
tsm-client: 8.1.15.1 -> 8.1.15.2, pin openssl version (#193556)
-rw-r--r--nixos/modules/programs/tsm-client.nix2
-rw-r--r--pkgs/tools/backup/tsm-client/default.nix10
-rw-r--r--pkgs/top-level/all-packages.nix9
3 files changed, 13 insertions, 8 deletions
diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index 89662cecaa4..7adff7cd28c 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -223,7 +223,7 @@ let
       description = lib.mdDoc ''
         The TSM client derivation to be
         added to the system environment.
-        It will called with `.override`
+        It will be used with `.override`
         to add paths to the client system-options file.
       '';
     };
diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix
index bc5f0586c6e..6dc75978d4a 100644
--- a/pkgs/tools/backup/tsm-client/default.nix
+++ b/pkgs/tools/backup/tsm-client/default.nix
@@ -52,17 +52,17 @@
 # going to the `downloadPage` (see `meta` below).
 # Find the "Backup-archive client" table on that page.
 # Look for "Download Documents" of the latest release.
-# Here, two links must be checked:
+# Here, two links must be checked if existing:
 # * "IBM Spectrum Protect Client ... Downloads and READMEs":
 #   In the table at the page's bottom,
 #   check the date of the "Linux x86_64 client"
 # * "IBM Spectrum Protect BA client ... interim fix downloads"
-# Look for the "Linux x86_64 client" rows
+# Look for the "Linux x86_64 client ..." rows
 # in the table at the bottom of each page.
 # Follow the "HTTPS" link of the row with the latest date stamp.
 # In the directory listing to show up, pick the big `.tar` file.
 #
-# (as of 2022-08-13)
+# (as of 2022-09-29)
 
 
 let
@@ -107,10 +107,10 @@ let
 
   unwrapped = stdenv.mkDerivation rec {
     name = "tsm-client-${version}-unwrapped";
-    version = "8.1.15.1";
+    version = "8.1.15.2";
     src = fetchurl {
       url = mkSrcUrl version;
-      hash = "sha512-DURIMlWlmu+l2UT3bAMaFPlwO+UlrfgaYCsm/JonvvC0K0WallhNKFd7sp0amPkU+4QHE2fkFrTGE3/lY+fghQ==";
+      hash = "sha512-ljygVoW7zR+LVHf4LSoBn3qEHISobsxheLxs9NyKWQiwPWpfhSgJO+bX4QRzAmrpSTNrETxHkuXqzGSHaaBlzg==";
     };
     inherit meta passthru;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9981749b3a1..8dd77520984 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6109,8 +6109,13 @@ with pkgs;
 
   timeline = callPackage ../applications/office/timeline { };
 
-  tsm-client = callPackage ../tools/backup/tsm-client { };
-  tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; };
+  tsm-client = callPackage ../tools/backup/tsm-client {
+    openssl = openssl_1_1;
+  };
+  tsm-client-withGui = callPackage ../tools/backup/tsm-client {
+    openssl = openssl_1_1;
+    enableGui = true;
+  };
 
   tracker = callPackage ../development/libraries/tracker { };