From 4b645383ce2bae4968879477a15ecf6cacae48f8 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 22 Aug 2023 11:11:28 +0800 Subject: [PATCH] clash: 1.17.0 -> 1.18.0 --- pkgs/tools/networking/clash/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 7eba0e1f2150..6cce7d247a5e 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clash"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-hUkUfNsThir0txO7cdxJl3sUF8/wHDvDPVspGp5xYUQ="; + rev = "v${version}"; + hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs="; }; - vendorHash = "sha256-M2hoorCBdq2nm5Gc5Xm6r7Cg9XUOirDyqTKwrmu121s="; + vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y="; # Do not build testing suit excludedPackages = [ "./test" ]; @@ -29,6 +29,10 @@ buildGoModule rec { "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; + checkFlags = [ + "-skip=TestParseRule" # Flaky tests + ]; + passthru.tests.version = testers.testVersion { package = clash; command = "clash -v"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b1857254af0..1f72e0889c1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4575,7 +4575,9 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + buildGoModule = buildGo121Module; + }; clash-geoip = callPackage ../data/misc/clash-geoip { };