diff options
| author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
| commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
| tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/tools/backup | |
| parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
| parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
| download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip | |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/bupstash/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/backup/tsm-client/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 44d16549cdd..e04f1b9e2eb 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DzRGhdUxfBW6iazpCHlQ9J8IL10FVxhac8kx6yBSGNk="; + sha256 = "sha256-0vDty8JPUOt7mmBzQ9t1lnUyExBYW4hPmzvvhLSZhcs="; }; - cargoSha256 = "sha256-IKk4VsO/oH4nC6F1W+JA3Agl7oXXNJ7zpP2PYpPLREU="; + cargoSha256 = "sha256-8W6uNLHCiCHB6mYyGnixiaHj1IyTnqjd8NaQG18W/uM="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index c432d47becd..e298751faca 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -152,7 +152,7 @@ buildEnv { ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys - ${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"} + ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"} for bin in $out/bin/* do target=$(readlink "$bin") |