public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shorewall: fix warnings due to types.loaOf being deprecated (#80154)

Browse Source
This commit is contained in:
Julien Moutinho
2020-02-16 12:53:49 +02:00
committed by GitHub
parent 1df3c86f2e
commit f9be656873
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/shorewall.nix
+1 -7
View File
@@ -33,7 +33,6 @@ in {
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content 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 = { environment = {
etc = lib.mapAttrsToList etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs;
(name: file:
{ source = file;
target = "shorewall/${name}";
})
cfg.configs;
systemPackages = [ cfg.package ]; systemPackages = [ cfg.package ];
}; };
}; };
nixos/modules/services/networking/shorewall6.nix
+1 -7
View File
@@ -33,7 +33,6 @@ in {
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content 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 = { environment = {
etc = lib.mapAttrsToList etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs;
(name: file:
{ source = file;
target = "shorewall6/${name}";
})
cfg.configs;
systemPackages = [ cfg.package ]; systemPackages = [ cfg.package ];
}; };
}; };