Unverified Commit ee17d382 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #250659 from aaronjheng/clash 

clash: 1.17.0 -> 1.18.0
parents b401f3aa 4b645383

pkgs/tools/networking/clash/default.nix

+8 −4
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };