From 42a2b8ca6e4a4406ecf0474ef9b7bc7f1a86c875 Mon Sep 17 00:00:00 2001 From: oluceps Date: Wed, 8 Nov 2023 15:23:41 +0800 Subject: [PATCH] nixos/dae: fix assetsPath defaultText --- nixos/modules/services/networking/dae.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/dae.nix b/nixos/modules/services/networking/dae.nix index 1c2c16c5d2903..f1786bbc6bfe0 100644 --- a/nixos/modules/services/networking/dae.nix +++ b/nixos/modules/services/networking/dae.nix @@ -14,7 +14,7 @@ in options = { services.dae = with lib;{ enable = mkEnableOption - (mdDoc "dae, a Linux high-performance transparent proxy solution based on eBPF"); + "dae, a Linux high-performance transparent proxy solution based on eBPF"; package = mkPackageOptionMD pkgs "dae" { }; @@ -23,7 +23,7 @@ in type = with types;(listOf path); default = with pkgs; [ v2ray-geoip v2ray-domain-list-community ]; defaultText = literalExpression "with pkgs; [ v2ray-geoip v2ray-domain-list-community ]"; - description = mdDoc '' + description = '' Assets required to run dae. ''; }; @@ -32,12 +32,12 @@ in type = types.str; default = "${genAssetsDrv assets}/share/v2ray"; defaultText = literalExpression '' - (symlinkJoin { + "$\{(symlinkJoin { name = "dae-assets"; paths = assets; - })/share/v2ray + })}/share/v2ray" ''; - description = mdDoc '' + description = '' The path which contains geolocation database. This option will override `assets`. ''; @@ -46,7 +46,7 @@ in openFirewall = mkOption { type = with types; submodule { options = { - enable = mkEnableOption (mdDoc "opening {option}`port` in the firewall"); + enable = mkEnableOption ("opening {option}`port` in the firewall"); port = mkOption { type = types.port; description = '' @@ -65,7 +65,7 @@ in port = 12345; } ''; - description = mdDoc '' + description = '' Open the firewall port. ''; }; @@ -74,7 +74,7 @@ in type = with types; (nullOr path); default = null; example = "/path/to/your/config.dae"; - description = mdDoc '' + description = '' The path of dae config file, end with `.dae`. ''; }; @@ -82,7 +82,7 @@ in config = mkOption { type = with types; (nullOr str); default = null; - description = mdDoc '' + description = '' WARNING: This option will expose store your config unencrypted world-readable in the nix store. Config text for dae. @@ -91,7 +91,7 @@ in }; disableTxChecksumIpGeneric = - mkEnableOption "" // { description = mdDoc "See "; }; + mkEnableOption "" // { description = "See "; }; }; };