From 939ee5022ead104146e07fffec27dac53d583d64 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 2 Jan 2020 12:51:19 +0200 Subject: [PATCH 1/3] clash: 0.16.0 -> 0.17.1 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 5829f5b5239b..39e59bc01604 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "1k6afpazggpd7cabbw6ldv77bjj43083d5diy2w0iq5nw69gmwd3"; + sha256 = "0zhbaw9jzl9wqc7yx8yxqlb6fwkss4pqkv26069qg6nsk584ndnf"; }; - modSha256 = "1fx53df67mq7p3ampr96x8hd99v2991alb16v8iq36f032raa32f"; + modSha256 = "0vyd61bin7hmpdqrmrikc776mgif9v25627n8hzi65kiycv40kgx"; meta = with stdenv.lib; { description = "A rule-based tunnel in Go"; From 2e43dd0e74b3117a1626f7e6814503b6739803e6 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 2 Jan 2020 12:52:14 +0200 Subject: [PATCH 2/3] clash: add filalex77 to maintainers --- pkgs/tools/networking/clash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 39e59bc01604..394afe3627e3 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; license = licenses.gpl3; - maintainers = with maintainers; [ contrun ]; + maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; } From 0f13282340ec48a5cf264c375db3641845e23bc5 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 2 Jan 2020 12:56:51 +0200 Subject: [PATCH 3/3] clash: add constant.Version to ldflags --- pkgs/tools/networking/clash/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 394afe3627e3..f3d0a584593b 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -11,8 +11,14 @@ buildGoModule rec { sha256 = "0zhbaw9jzl9wqc7yx8yxqlb6fwkss4pqkv26069qg6nsk584ndnf"; }; + goPackagePath = "github.com/Dreamacro/clash"; modSha256 = "0vyd61bin7hmpdqrmrikc776mgif9v25627n8hzi65kiycv40kgx"; + buildFlagsArray = [ + "-ldflags=" + "-X ${goPackagePath}/constant.Version=${version}" + ]; + meta = with stdenv.lib; { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash";