Unverified Commit a061921d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #266747 from NickCao/clash 

clash: drop as upstream has gone
parents 2c788cdf f398f6c3

pkgs/applications/networking/clash-verge/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
, dpkg

, wrapGAppsHook

, autoPatchelfHook

, clash

, clash-meta

, openssl

, webkitgtk
@@ -49,7 +48,6 @@ stdenv.mkDerivation rec { 
  '';



  postFixup = ''

    ln -s ${lib.getExe clash} $out/bin/clash

    ln -s ${lib.getExe clash-meta} $out/bin/clash-meta

  '';

pkgs/tools/networking/clash/default.nix

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildGoModule

, testers

, clash

}:



buildGoModule rec {

  pname = "clash";

  version = "1.18.0";



  src = fetchFromGitHub {

    owner = "Dreamacro";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs=";

  };



  vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y=";



  # Do not build testing suit

  excludedPackages = [ "./test" ];



  CGO_ENABLED = 0;



  ldflags = [

    "-s"

    "-w"

    "-X github.com/Dreamacro/clash/constant.Version=${version}"

  ];



  checkFlags = [

    "-skip=TestParseRule" # Flaky tests

  ];



  passthru.tests.version = testers.testVersion {

    package = clash;

    command = "clash -v";

  };



  meta = with lib; {

    description = "A rule-based tunnel in Go";

    homepage = "https://dreamacro.github.io/clash/";

    changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ contrun Br1ght0ne ];

    mainProgram = "clash";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ mapAliases ({ 
  composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08

  cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15

  crispyDoom = crispy-doom; # Added 2023-05-01

  clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10

  clasp = clingo; # added 2022-12-22

  claws-mail-gtk3 = claws-mail; # Added 2021-07-10

  cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -4668,8 +4668,6 @@ with pkgs; 














  map-cmd = callPackage ../tools/misc/map { };



























  clash = callPackage ../tools/networking/clash { };



























  clash-geoip = callPackage ../data/misc/clash-geoip { };





























  clash-meta = callPackage ../tools/networking/clash-meta { };