From 3ade643fd4a66c0fcce71e3e866e701bca3e83c8 Mon Sep 17 00:00:00 2001 From: kiria-moe Date: Tue, 1 Apr 2025 18:24:56 +0800 Subject: [PATCH 1/2] trojan-go: fix Trojan-go's all functionalities need to be enabled explicitly. --- pkgs/by-name/tr/trojan-go/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 40087b8834b7..7d75473ce924 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,15 @@ buildGoModule rec { vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4="; + tags = [ + "api" + "client" + "server" + "forward" + "nat" + "other" + ]; + # tests fail due to requiring networking doCheck = false; From 2694e87a3a61cc796d0af6d2af555062f698b511 Mon Sep 17 00:00:00 2001 From: kiria-moe Date: Tue, 1 Apr 2025 18:36:55 +0800 Subject: [PATCH 2/2] trojan-go: chore Set the version and commit id. --- pkgs/by-name/tr/trojan-go/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 7d75473ce924..7724ca0924a6 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,11 @@ buildGoModule rec { vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4="; + ldflags = [ + "-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}" + "-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}" + ]; + tags = [ "api" "client"