Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 136e4c1fb0e2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 556b6f35f6cc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 25, 2020

  1. nixos/i2pd: address #63103 

    As a comment to 1d61efb
Note that collect returns a list from a set

(cherry picked from commit 9bab9e2)
    @edwtjo @woffs
    edwtjo authored and woffs committed May 25, 2020
    Copy the full SHA
    ef573a2 View commit details

Commits on May 26, 2020

  1. Merge pull request #88884 from woffs/pr-fix-86540 

    [20.03] nixos/i2pd: address #63103
    @rnhmjoj
    rnhmjoj authored May 26, 2020
    Copy the full SHA
    556b6f3 View commit details
Showing with 11 additions and 11 deletions.
  1. +11 −11 nixos/modules/services/networking/i2pd.nix
22 changes: 11 additions & 11 deletions nixos/modules/services/networking/i2pd.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {