borgmatic: Allow top-level extra options

Fix #3760.
nix-community · Mar 20, 2023 · aed4339 · aed4339
1 parent 9e3c2b3
commit aed4339
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix
@@ -119,13 +119,15 @@ let
 
         extraConfig = extraConfigOption;
       };
+
+      extraConfig = extraConfigOption;
     };
   };
 
   removeNullValues = attrSet: filterAttrs (key: value: value != null) attrSet;
 
   writeConfig = config:
-    generators.toYAML { } {
+    generators.toYAML { } ({
       location = removeNullValues {
         source_directories = config.location.sourceDirectories;
         repositories = config.location.repositories;
@@ -145,7 +147,7 @@ let
       } // config.retention.extraConfig;
       consistency = removeNullValues { checks = config.consistency.checks; }
         // config.consistency.extraConfig;
-    };
+    } // config.extraConfig);
 in {
   meta.maintainers = [ maintainers.DamienCassou ];
 

diff --git a/tests/modules/programs/borgmatic/basic-configuration.nix b/tests/modules/programs/borgmatic/basic-configuration.nix
@@ -43,6 +43,12 @@ in {
 
             extraConfig = { prefix = "hostname"; };
           };
+
+          extraConfig = {
+            hooks = {
+              before_actions = [ "echo Starting actions." ];
+            };
+          };
         };
       };
     };
@@ -96,6 +102,8 @@ in {
       }"
       expectations[consistency.prefix]="${backups.main.consistency.extraConfig.prefix}"
 
+      expectations[hooks.before_actions[0]]="echo Starting actions."
+
       yq=${pkgs.yq-go}/bin/yq
 
       for filter in "''${!expectations[@]}"; do