diff options
| author | Julien Moutinho <ju1m@users.noreply.github.com> | 2020-02-16 11:53:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:53:49 +0200 |
| commit | f9be656873dacbc5f51f0cea41e5c4ea0f358b2b (patch) | |
| tree | 4ac0c465f0a3e8cad5ade1eb5d7cb5f3829cfe1d /nixos | |
| parent | 1df3c86f2e0b58ae53d6d074ec484d547ff9dacb (diff) | |
| download | nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar.gz nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar.bz2 nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar.lz nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar.xz nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.tar.zst nixpkgs-f9be656873dacbc5f51f0cea41e5c4ea0f358b2b.zip | |
shorewall: fix warnings due to types.loaOf being deprecated (#80154)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/shorewall.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/networking/shorewall6.nix | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/nixos/modules/services/networking/shorewall.nix b/nixos/modules/services/networking/shorewall.nix index 0f94d414fcf..c59a5366915 100644 --- a/nixos/modules/services/networking/shorewall.nix +++ b/nixos/modules/services/networking/shorewall.nix @@ -33,7 +33,6 @@ in { The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; - apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -63,12 +62,7 @@ in { ''; }; environment = { - etc = lib.mapAttrsToList - (name: file: - { source = file; - target = "shorewall/${name}"; - }) - cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix index 9c22a037c0b..374e407cc7a 100644 --- a/nixos/modules/services/networking/shorewall6.nix +++ b/nixos/modules/services/networking/shorewall6.nix @@ -33,7 +33,6 @@ in { The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; - apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -63,12 +62,7 @@ in { ''; }; environment = { - etc = lib.mapAttrsToList - (name: file: - { source = file; - target = "shorewall6/${name}"; - }) - cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; |