From f9be656873dacbc5f51f0cea41e5c4ea0f358b2b Mon Sep 17 00:00:00 2001
From: Julien Moutinho <ju1m@users.noreply.github.com>
Date: Sun, 16 Feb 2020 11:53:49 +0100
Subject: [PATCH] shorewall: fix warnings due to types.loaOf being deprecated
(#80154)
---
nixos/modules/services/networking/shorewall.nix | 8 +-------
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 0f94d414fcf7..c59a53669158 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 9c22a037c0b4..374e407cc7a1 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 ];
};
};