···

       
26
       
26
       
 
       
        description = "The shorewall package to use.";

     

       
27
       
27
       
 
       
      };

     

       
28
       
28
       
 
       
      configs = lib.mkOption {

     

       
29
       
29
       
-
       
        type        = types.attrsOf types.str;

     

       
29
       
29
       
+
       
        type        = types.attrsOf types.lines;

     

       
30
       
30
       
 
       
        default     = {};

     

       
31
       
31
       
 
       
        description = ''

     

       
32
       
32
       
 
       
          This option defines the Shorewall configs.

     

       
33
       
33
       
 
       
          The attribute name defines the name of the config,

     

       
34
       
34
       
 
       
          and the attribute value defines the content of the config.

     

       
35
       
35
       
 
       
        '';

     

       
36
       
36
       
+
       
        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);

     

       
36
       
37
       
 
       
      };

     

       
37
       
38
       
 
       
    };

     

       
38
       
39
       
 
       
  };

     
···

       
62
       
63
       
 
       
      '';

     

       
63
       
64
       
 
       
    };

     

       
64
       
65
       
 
       
    environment = {

     

       
65
       
65
       
-
       
      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs;

     

       
66
       
66
       
+
       
      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {source=conf;}) cfg.configs;

     

       
66
       
67
       
 
       
      systemPackages = [ cfg.package ];

     

       
67
       
68
       
 
       
    };

     

       
68
       
69
       
 
       
  };

     

···

       
26
       
26
       
 
       
        description = "The shorewall package to use.";

     

       
27
       
27
       
 
       
      };

     

       
28
       
28
       
 
       
      configs = lib.mkOption {

     

       
29
       
29
       
-
       
        type        = types.attrsOf types.str;

     

       
29
       
29
       
+
       
        type        = types.attrsOf types.lines;

     

       
30
       
30
       
 
       
        default     = {};

     

       
31
       
31
       
 
       
        description = ''

     

       
32
       
32
       
 
       
          This option defines the Shorewall configs.

     

       
33
       
33
       
 
       
          The attribute name defines the name of the config,

     

       
34
       
34
       
 
       
          and the attribute value defines the content of the config.

     

       
35
       
35
       
 
       
        '';

     

       
36
       
36
       
+
       
        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);

     

       
36
       
37
       
 
       
      };

     

       
37
       
38
       
 
       
    };

     

       
38
       
39
       
 
       
  };

     
···

       
62
       
63
       
 
       
      '';

     

       
63
       
64
       
 
       
    };

     

       
64
       
65
       
 
       
    environment = {

     

       
65
       
65
       
-
       
      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs;

     

       
66
       
66
       
+
       
      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {source=conf;}) cfg.configs;

     

       
66
       
67
       
 
       
      systemPackages = [ cfg.package ];

     

       
67
       
68
       
 
       
    };

     

       
68
       
69
       
 
       
  };