ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #320277 from Yarny0/tsm-client-update

Browse Source 
tsm-client: update and migrate to by-name and finalAttrs
This commit is contained in:
Peder Bergebakken Sundt 2024-07-10 19:00:24 +02:00 committed by GitHub
commit 447ca95585
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/tsm-client.nix
View File

@ -22,7 +22,7 @@ let
serverOptions = { name, config, ... }: {
freeformType = attrsOf (either scalarType (listOf scalarType));
# Client system-options file directives are explained here:
# https://www.ibm.com/docs/en/storage-protect/8.1.22?topic=commands-processing-options
# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=commands-processing-options
options.servername = mkOption {
type = servernameType;
default = name;

2
nixos/modules/services/backup/tsm.nix
View File

@ -90,7 +90,7 @@ in
environment.HOME = "/var/lib/tsm-backup";
serviceConfig = {
# for exit status description see
# https://www.ibm.com/docs/en/storage-protect/8.1.22?topic=clients-client-return-codes
# https://www.ibm.com/docs/en/storage-protect/8.1.23?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.

18
pkgs/tools/backup/tsm-client/default.nix → pkgs/by-name/ts/tsm-client/package.nix
View File

@ -11,7 +11,7 @@
, acl # EXT2/EXT3/XFS ACL support (optional)
, gnugrep
, procps
, jdk8 # Java GUI (needed for `enableGui`)
, jdk # Java GUI (needed for `enableGui`)
, buildEnv
, makeWrapper
, enableGui ? false # enables Java GUI `dsmj`
@ -45,7 +45,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.22?topic=solaris-set-api-environment-variables
# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=solaris-set-api-environment-variables
# The newest version of TSM client should be discoverable by
@ -102,12 +102,12 @@ let
in
"https://public.dhe.ibm.com/storage/tivoli-storage-management/${if fixup=="0" then "maintenance" else "patches"}/client/v${major}r${minor}/Linux/LinuxX86/BA/v${major}${minor}${patch}/${version}-TIV-TSMBAC-LinuxX86.tar";
unwrapped = stdenv.mkDerivation rec {
name = "tsm-client-${version}-unwrapped";
version = "8.1.22.0";
unwrapped = stdenv.mkDerivation (finalAttrs: {
name = "tsm-client-${finalAttrs.version}-unwrapped";
version = "8.1.23.0";
src = fetchurl {
url = mkSrcUrl version;
hash = "sha512-tsmrnZ0zoGCmpp9ey2K6ad8tMVBgB+lYMTx7YgVOSXNeiGT76fUYdr9DmO+PEsj+J/Pg/skd7ywqsBbjQT+eiw==";
url = mkSrcUrl finalAttrs.version;
hash = "sha512-LydzEvzcv7sizSQkVmkbJ/WhunP6oJm32M6nstIfSginCLwYoSb5WbnjeQq2PM2xncFN8W/SteUtCPYbOVKaKA==";
};
inherit meta passthru;
@ -162,10 +162,10 @@ let
ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link"
done
'';
};
});
binPath = lib.makeBinPath ([ acl gnugrep procps ]
++ lib.optional enableGui jdk8);
++ lib.optional enableGui jdk);
in

0
pkgs/tools/backup/tsm-client/test-cli.nix → pkgs/by-name/ts/tsm-client/test-cli.nix
View File

3
pkgs/top-level/all-packages.nix
View File

@ -7522,8 +7522,7 @@ 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-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
tracker = callPackage ../development/libraries/tracker { };