alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source
This commit is contained in:
Julien Moutinho 2020-02-16 11:53:49 +01:00 committed by GitHub
parent 1df3c86f2e
commit f9be656873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/networking/shorewall.nix
View file

@ -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 ];
};
};

8
nixos/modules/services/networking/shorewall6.nix
View file

@ -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 ];
};
};