dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #224859 from Yarny0/tsm-client

Browse Source 
tsm-client: use `libxcrypt-legacy`, drop `openssl_1_1`, use `concatLines` in module
This commit is contained in:
ajs124 2023-04-11 11:17:29 +02:00 committed by GitHub
commit f7245e9e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ let
inherit (lib.attrsets) attrNames filterAttrs hasAttr mapAttrs mapAttrsToList optionalAttrs; inherit (lib.attrsets) attrNames filterAttrs hasAttr mapAttrs mapAttrsToList optionalAttrs;
inherit (lib.modules) mkDefault mkIf; inherit (lib.modules) mkDefault mkIf;
inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.strings) concatStringsSep optionalString toLower; inherit (lib.strings) concatLines optionalString toLower;
inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule; inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule;
# Checks if given list of strings contains unique # Checks if given list of strings contains unique
@ -164,7 +164,7 @@ let
mkLine = k: v: k + optionalString (v!="") " ${v}"; mkLine = k: v: k + optionalString (v!="") " ${v}";
lines = mapAttrsToList mkLine attrset; lines = mapAttrsToList mkLine attrset;
in in
concatStringsSep "\n" lines; concatLines lines;
config.stanza = '' config.stanza = ''
server ${config.name} server ${config.name}
${config.text} ${config.text}
@ -263,7 +263,7 @@ let
${optionalString (cfg.defaultServername!=null) "defaultserver ${cfg.defaultServername}"} ${optionalString (cfg.defaultServername!=null) "defaultserver ${cfg.defaultServername}"}
${concatStringsSep "\n" (mapAttrsToList (k: v: v.stanza) cfg.servers)} ${concatLines (mapAttrsToList (k: v: v.stanza) cfg.servers)}
''; '';
in in

13
pkgs/tools/backup/tsm-client/default.nix
View File

@ -5,8 +5,7 @@
, fetchurl , fetchurl
, autoPatchelfHook , autoPatchelfHook
, rpmextract , rpmextract
, libxcrypt , libxcrypt-legacy
, openssl
, zlib , zlib
, lvm2 # LVM image backup and restore functions (optional) , lvm2 # LVM image backup and restore functions (optional)
, acl # EXT2/EXT3/XFS ACL support (optional) , acl # EXT2/EXT3/XFS ACL support (optional)
@ -117,8 +116,7 @@ let
rpmextract rpmextract
]; ];
buildInputs = [ buildInputs = [
libxcrypt libxcrypt-legacy
openssl
stdenv.cc.cc stdenv.cc.cc
zlib zlib
]; ];
@ -146,7 +144,8 @@ let
runHook postInstall runHook postInstall
''; '';
# Fix relative symlinks after `/usr` was moved up one level # fix relative symlinks after `/usr` was moved up one level,
# fix absolute symlinks pointing to `/opt`
preFixup = '' preFixup = ''
for link in $out/lib{,64}/* $out/bin/* for link in $out/lib{,64}/* $out/bin/*
do do
@ -158,6 +157,10 @@ let
fi fi
ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link"
done done
for link in $(find $out -type l -lname '/opt/*')
do
ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link"
done
''; '';
}; };

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

@ -7044,13 +7044,8 @@ with pkgs;
timeline = callPackage ../applications/office/timeline { }; timeline = callPackage ../applications/office/timeline { };
tsm-client = callPackage ../tools/backup/tsm-client { tsm-client = callPackage ../tools/backup/tsm-client { };
openssl = openssl_1_1; tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; };
};
tsm-client-withGui = callPackage ../tools/backup/tsm-client {
openssl = openssl_1_1;
enableGui = true;
};
tracker = callPackage ../development/libraries/tracker { }; tracker = callPackage ../development/libraries/tracker { };