diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2020-02-19 13:10:26 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2020-02-19 13:15:28 +0100 |
| commit | 9bab9e2ec6be97489ab712b69f7fbb3ece4739d7 (patch) | |
| tree | 8fd5a8530afb2626c3ba3cf6b8a77d6eb7da8ddf /nixos/modules/services/networking/i2pd.nix | |
| parent | 482642a733f1254d33b816f51c152fbd269db818 (diff) | |
| download | nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar.gz nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar.bz2 nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar.lz nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar.xz nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.tar.zst nixpkgs-9bab9e2ec6be97489ab712b69f7fbb3ece4739d7.zip | |
nixos/i2pd: address #63103
As a comment to 1d61efb7f177f7b70c467ab4940fde0a3481d4dc Note that collect returns a list from a set
Diffstat (limited to 'nixos/modules/services/networking/i2pd.nix')
| -rw-r--r-- | nixos/modules/services/networking/i2pd.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 326d34f6ca9..93a21fd4c97 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -158,10 +158,10 @@ let (sec "addressbook") (strOpt "defaulturl" cfg.addressbook.defaulturl) ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions) - ++ (flip mapAttrs - (collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto) + ++ (flip map + (collect (proto: proto ? port && proto ? address) cfg.proto) (proto: let protoOpts = [ - (sec name) + (sec proto.name) (boolOpt "enabled" proto.enable) (strOpt "address" proto.address) (intOpt "port" proto.port) @@ -181,10 +181,10 @@ let tunnelConf = let opts = [ notice - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels) + (flip map + (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) (tun: let outTunOpts = [ - (sec name) + (sec tun.name) "type = client" (intOpt "port" tun.port) (strOpt "destination" tun.destination) @@ -204,10 +204,10 @@ let ++ (if tun ? crypto.tagsToSend then optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []); in concatStringsSep "\n" outTunOpts)) - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? address) cfg.inTunnels) + (flip map + (collect (tun: tun ? port && tun ? address) cfg.inTunnels) (tun: let inTunOpts = [ - (sec name) + (sec tun.name) "type = server" (intOpt "port" tun.port) (strOpt "host" tun.address) @@ -606,7 +606,7 @@ in outTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { destinationPort = mkOption { @@ -627,7 +627,7 @@ in inTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { inPort = mkOption { |