Unverified Commit ed742ab4 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

tsm-client: 8.1.20.0 -> 8.1.21.0
parents a107d8e9 59539b9b

nixos/modules/programs/tsm-client.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.20?topic=commands-processing-options

    # https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=commands-processing-options

    options.servername = mkOption {

      type = servernameType;

      default = name;

nixos/modules/services/backup/tsm.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.20?topic=clients-client-return-codes

        # https://www.ibm.com/docs/en/storage-protect/8.1.21?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/tests/tsm-client-gui.nix

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { 
    machine.execute("DSM_LOG=/tmp dsmj -optfile=/dev/null >&2 &")



    # does it report the "TCP/IP connection failure" error code?

    machine.wait_for_window("IBM Spectrum Protect")

    machine.wait_for_window("IBM Storage Protect")

    machine.wait_for_text("ANS2610S")

    machine.send_key("esc")

pkgs/tools/backup/tsm-client/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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/spectrum-protect/8.1.20?topic=solaris-set-api-environment-variables

# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=solaris-set-api-environment-variables





# The newest version of TSM client should be discoverable by
@@ -104,10 +104,10 @@ let 


  unwrapped = stdenv.mkDerivation rec {

    name = "tsm-client-${version}-unwrapped";

    version = "8.1.20.0";

    version = "8.1.21.0";

    src = fetchurl {

      url = mkSrcUrl version;

      hash = "sha512-UZ5hRXGlB/1B4gZ8/i9OCHsxSuRkbAcp195zl/M75HtTi8o0rOfOh3LMmn4x4/M1V8d60ix7Tn4Mv8xkm7QXzw==";

      hash = "sha512-iXkVYQsqbNhQJmrYl5a5433iSl6kg6YzlTlgCzpFGslMn+3ynSmYn8Rtxwitp931SwmV4a53tGctSuisz8pOCg==";

    };

    inherit meta passthru;