From 833c15d4bfd80436e7601e0bae50dd4b1b9af13b Mon Sep 17 00:00:00 2001 From: Ember 'n0emis' Keske Date: Wed, 23 Mar 2022 14:01:16 +0100 Subject: [PATCH] fix errors with missing function parameters --- modules/default.nix | 5 +++-- modules/fastd.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index e844926..f37f713 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,11 +9,12 @@ let mkDomain = name: domCfg: let cidrToAddress = cidr: head (splitString "/" cidr); - mkIfName = substring 0 16 (type: + mkIfName = type: substring 0 16 ( if type == "bridge" then "br-${name}" else if type == "batman" then "bat-${name}" else if type == "fastd" then "fd-${name}" else - throw "unknown interface type ${type}, coud not generate name"); + throw "unknown interface type ${type}, coud not generate name" + ); in { #### NULL-ROUTES #### networks."10-lo" = { diff --git a/modules/fastd.nix b/modules/fastd.nix index ed173ec..b45fa87 100644 --- a/modules/fastd.nix +++ b/modules/fastd.nix @@ -221,7 +221,7 @@ let blacklist = if (values.blacklistedKeys == null) then null else pkgs.writeText "fastd-blacklist-${name}" values.blacklistedKeys; - verifyScript = if (values.verifyScript != null) then pkgs.writeScript "fastd-verify-${name}.sh" + verifyScript = if (values.verifyScript != null) then pkgs.writeScript "fastd-verify-${name}.sh" values.verifyScript else if (values.blacklistedKeys != null) then pkgs.writeScript "fastd-verify-${name}.sh" '' #!${pkgs.stdenv.shell} PEER_KEY=$1