From 8c9561175aa9ae1159c080f80fdc0d15e456c3ad Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 17 Mar 2023 15:42:35 +0800 Subject: [PATCH 1/2] sing-box: 1.1.6 -> 1.1.7 Diff: https://github.com/SagerNet/sing-box/compare/v1.1.6...v1.1.7 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 6d039cf541fb..0796e5dfab54 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-CwXhCJo6Nq0dZaTcUetsSpvNKme1PN6pzMRX1QeY3gg="; + hash = "sha256-jovUK535vZeCgnnW+9/gjXwCkNLMXdiCJwWqFKCubcU="; }; - vendorHash = "sha256-cLaMtnTSmCZoPwfeQpWXCiFtmDm3vA6AD12H5h8Obhk="; + vendorHash = "sha256-WYMCsFX5/4H+Bc0KcxcPMjfz2wEXz3V4D0sww15AgvE="; tags = [ "with_quic" From 30a52ec2c261f86c7374ebc7668025c17202d8c9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 17 Mar 2023 15:48:33 +0800 Subject: [PATCH 2/2] sing-box: set ldflags to embed version info --- pkgs/tools/networking/sing-box/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 0796e5dfab54..51834785c73a 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -38,6 +38,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-X=github.com/sagernet/sing-box/constant.Version=${version}" + ]; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' installShellCompletion --cmd sing-box \ --bash <(${emulator} $out/bin/sing-box completion bash) \