nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

restic: fix evaluation error in rcloneOptions

Browse source 
`lib.add` only works on integers.
This commit is contained in:
Jess 2026-01-19 14:47:39 +13:00 • committed by Austin Horstman
parent b9ded38afa
commit 83eeebd967
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/services/restic.nix
View file

@ -24,10 +24,11 @@ let
lib.pipe opt [
(lib.replaceStrings [ "-" ] [ "_" ])
lib.toUpper
(lib.add "RCLONE_")
(upper: "RCLONE_" + upper)
];
toEnvVal = v: if lib.isBool v then lib.boolToString v else v;
toEnvVal = v: if lib.isBool v then lib.boolToString v else toString v;
attrsToEnvs =
attrs:
lib.pipe attrs [
@ -127,6 +128,7 @@ in
attrsOf (oneOf [
str
bool
int
]);
default = { };
apply = lib.mapAttrs' (opt: v: lib.nameValuePair (fmtRcloneOpt opt) v);

5
tests/modules/services/restic/backup-configs.nix
View file

@ -91,6 +91,11 @@ in
;
initialize = true;
repository = "rclone:local:/root/restic-rclone-backup";
rcloneOptions = {
checksum = true;
color = "ALWAYS";
list-cutoff = 5;
};
};
prune = {

3
tests/modules/services/restic/unit-files.nix
View file

@ -106,6 +106,9 @@ in
serviceFile=$serviceFiles/restic-backups-"$backup".service
assertFileRegex $serviceFile "Environment=RESTIC_REPOSITORY=rclone:local:/root/restic-rclone-backup"
assertFileRegex $serviceFile "Environment=RESTIC_PASSWORD_FILE"
assertFileRegex $serviceFile "Environment=RCLONE_CHECKSUM=true"
assertFileRegex $serviceFile "Environment=RCLONE_COLOR=ALWAYS"
assertFileRegex $serviceFile "Environment=RCLONE_LIST_CUTOFF=5"
assertFileRegex $serviceFile "ExecStart=.*$defaultPruneOpts"
for part in ''${defaultPruneOpts[@]}; do
assertFileRegex $serviceFile "ExecStart=.*$part"