cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #250659 from aaronjheng/clash

Browse source 
clash: 1.17.0 -> 1.18.0
This commit is contained in:
Jonas Heinrich 2023-08-22 19:02:41 +02:00 committed by GitHub
commit ee17d3829c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/clash/default.nix
View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "clash"; pname = "clash";
version = "1.17.0"; version = "1.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dreamacro"; owner = "Dreamacro";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "v${version}";
hash = "sha256-hUkUfNsThir0txO7cdxJl3sUF8/wHDvDPVspGp5xYUQ="; hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs=";
}; };
vendorHash = "sha256-M2hoorCBdq2nm5Gc5Xm6r7Cg9XUOirDyqTKwrmu121s="; vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y=";
# Do not build testing suit # Do not build testing suit
excludedPackages = [ "./test" ]; excludedPackages = [ "./test" ];
@ -29,6 +29,10 @@ buildGoModule rec {
"-X github.com/Dreamacro/clash/constant.Version=${version}" "-X github.com/Dreamacro/clash/constant.Version=${version}"
]; ];
checkFlags = [
"-skip=TestParseRule" # Flaky tests
];
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = clash; package = clash;
command = "clash -v"; command = "clash -v";

4
pkgs/top-level/all-packages.nix
View file

@ -4575,7 +4575,9 @@ with pkgs;
map-cmd = callPackage ../tools/misc/map { }; 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 { }; clash-geoip = callPackage ../data/misc/clash-geoip { };