diff options
author | Nick Cao <nickcao@nichi.co> | 2023-11-11 09:32:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 09:32:16 -0500 |
commit | a061921d8b33b680774f81179939a0383c10d661 (patch) | |
tree | 5bfe25d91cdbaaaf7ab9555d9d04528d4ffccc27 | |
parent | 2c788cdf30ec0d107a99b6081d732dd682ba8f75 (diff) | |
parent | f398f6c38fe54d723e1afce28139a869dc79dbca (diff) | |
download | nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar.gz nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar.bz2 nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar.lz nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar.xz nixpkgs-a061921d8b33b680774f81179939a0383c10d661.tar.zst nixpkgs-a061921d8b33b680774f81179939a0383c10d661.zip |
Merge pull request #266747 from NickCao/clash
clash: drop as upstream has gone
-rw-r--r-- | pkgs/applications/networking/clash-verge/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/clash/default.nix | 49 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 1 insertions, 53 deletions
diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 82a31f3e5e2..f83583283d4 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -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 ''; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix deleted file mode 100644 index 6cce7d247a5..00000000000 --- a/pkgs/tools/networking/clash/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ 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"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a79082575c..43fb25304da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6994e8945b..ca923662042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |