From 9ac4777d98d04fc2cc0604a0fc04830c3be431b9 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 9 Aug 2024 23:16:10 +0800 Subject: [PATCH 1/2] nixos/localsend: add package option --- nixos/modules/programs/localsend.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/localsend.nix b/nixos/modules/programs/localsend.nix index 47f54246a40f..14005c983a1a 100644 --- a/nixos/modules/programs/localsend.nix +++ b/nixos/modules/programs/localsend.nix @@ -12,13 +12,17 @@ in options.programs.localsend = { enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop"; - openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // { - default = true; - }; + package = lib.mkPackageOption pkgs "localsend" { }; + + openFirewall = + lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" + // { + default = true; + }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.localsend ]; + environment.systemPackages = [ cfg.package ]; networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; }; From 0b097987fe34e0f93216679b1c222f1b3fe88787 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 9 Aug 2024 23:16:30 +0800 Subject: [PATCH 2/2] nixos/localsend: allow udp port --- nixos/modules/programs/localsend.nix | 1 + nixos/tests/localsend.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/programs/localsend.nix b/nixos/modules/programs/localsend.nix index 14005c983a1a..a4580057ba4b 100644 --- a/nixos/modules/programs/localsend.nix +++ b/nixos/modules/programs/localsend.nix @@ -24,6 +24,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; + networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; }; meta.maintainers = with lib.maintainers; [ pandapip1 ]; diff --git a/nixos/tests/localsend.nix b/nixos/tests/localsend.nix index 8c0a6ac68190..551b6dd73ce8 100644 --- a/nixos/tests/localsend.nix +++ b/nixos/tests/localsend.nix @@ -16,6 +16,7 @@ import ./make-test-python.nix ( machine.wait_for_open_port(53317) machine.wait_for_window("LocalSend", 10) machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'") + machine.succeed("netstat --listening --program --udp | grep -P 'udp.*53317.*localsend'") ''; } )