summary refs log tree commit diff
path: root/nixos/modules/services/backup
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-10-01 17:57:45 +0200
committerGitHub <noreply@github.com>2016-10-01 17:57:45 +0200
commit7e80c42b0ead918defafb92893c605983319e418 (patch)
tree057bf37267cf75493af45cf9e92f3337b5b55e80 /nixos/modules/services/backup
parent46693bd6e824ead3cf46c3deace190969a249010 (diff)
parentf9239053465d06a823268c962505d3327049f12a (diff)
downloadnixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar.gz
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar.bz2
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar.lz
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar.xz
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.tar.zst
nixpkgs-7e80c42b0ead918defafb92893c605983319e418.zip
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
modules: optionSet -> submodule
Diffstat (limited to 'nixos/modules/services/backup')
-rw-r--r--nixos/modules/services/backup/bacula.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 8a26aae75fe..ef8e5e55ede 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -198,8 +198,7 @@ in {
         description = ''
           This option defines director resources in Bacula File Daemon.
         '';
-        type = types.attrsOf types.optionSet;
-        options = [ directorOptions ];
+        type = with types; attrsOf (submodule directorOptions);
       };
 
       extraClientConfig = mkOption {
@@ -253,8 +252,7 @@ in {
         description = ''
           This option defines Director resources in Bacula Storage Daemon.
         '';
-        type = types.attrsOf types.optionSet;
-        options = [ directorOptions ];
+        type = with types; attrsOf (submodule directorOptions);
       };
 
       device = mkOption {
@@ -262,8 +260,7 @@ in {
         description = ''
           This option defines Device resources in Bacula Storage Daemon.
         '';
-        type = types.attrsOf types.optionSet;
-        options = [ deviceOptions ];
+        type = with types; attrsOf (submodule deviceOptions);
       };
  
       extraStorageConfig = mkOption {