Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

borgmatic: add missing support for output and hooks

Browse source 
Fixes #3760
This commit is contained in:
Damien Cassou 2023-06-18 07:57:41 +02:00 committed by Robert Helgesson
parent e8b5f8f9b3
commit ec58f8bed7
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/programs/borgmatic.nix
View file

@ -134,6 +134,10 @@ let
extraConfig = extraConfigOption; extraConfig = extraConfigOption;
}; };
output = { extraConfig = extraConfigOption; };
hooks = { extraConfig = extraConfigOption; };
}; };
}); });
@ -168,6 +172,8 @@ let
} // config.retention.extraConfig; } // config.retention.extraConfig;
consistency = removeNullValues { checks = config.consistency.checks; } consistency = removeNullValues { checks = config.consistency.checks; }
// config.consistency.extraConfig; // config.consistency.extraConfig;
output = config.output.extraConfig;
hooks = config.hooks.extraConfig;
}; };
in { in {
meta.maintainers = [ maintainers.DamienCassou ]; meta.maintainers = [ maintainers.DamienCassou ];

12
tests/modules/programs/borgmatic/basic-configuration.nix
View file

@ -44,6 +44,12 @@ in {
extraConfig = { prefix = "hostname"; }; extraConfig = { prefix = "hostname"; };
}; };
output = { extraConfig = { color = false; }; };
hooks = {
extraConfig = { before_actions = [ "echo Starting actions." ]; };
};
}; };
}; };
}; };
@ -96,6 +102,12 @@ in {
(builtins.elemAt backups.main.consistency.checks 1).frequency (builtins.elemAt backups.main.consistency.checks 1).frequency
}" }"
expectations[consistency.prefix]="${backups.main.consistency.extraConfig.prefix}" expectations[consistency.prefix]="${backups.main.consistency.extraConfig.prefix}"
expectations[output.color]="${
boolToString backups.main.output.extraConfig.color
}"
expectations[hooks.before_actions[0]]="${
builtins.elemAt backups.main.hooks.extraConfig.before_actions 0
}"
yq=${pkgs.yq-go}/bin/yq yq=${pkgs.yq-go}/bin/yq