borgmatic: allow top-level extra options

Fixes #3760
nix-community · Mar 21, 2023 · 9b118d1 · 9b118d1
1 parent a8f5ca2
commit 9b118d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix
@@ -134,6 +134,8 @@ let
 
         extraConfig = extraConfigOption;
       };
+
+      extraConfig = extraConfigOption;
     };
   });
 
@@ -148,7 +150,7 @@ let
   hmExcludeFile = pkgs.writeText "hm-symlinks.txt" hmExcludePatterns;
 
   writeConfig = config:
-    generators.toYAML { } {
+    generators.toYAML { } ({
       location = removeNullValues {
         source_directories = config.location.sourceDirectories;
         repositories = config.location.repositories;
@@ -168,7 +170,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,10 @@ in {
 
             extraConfig = { prefix = "hostname"; };
           };
+
+          extraConfig = {
+            hooks = { before_actions = [ "echo Starting actions." ]; };
+          };
         };
       };
     };
@@ -96,6 +100,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