diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index 4425fe1a9fe7..a2912cb1d8e0 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -1,9 +1,22 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { options.programs.clash-verge = { enable = lib.mkEnableOption "Clash Verge"; - package = lib.mkPackageOption pkgs "clash-verge" {}; + package = lib.mkOption { + type = lib.types.package; + description = '' + The clash-verge package to use. Available options are + clash-verge-rev and clash-nyanpasu, both are forks of + the original clash-verge project. + ''; + example = "pkgs.clash-verge-rev"; + }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; tunMode = lib.mkEnableOption "Clash Verge TUN mode"; }; @@ -16,10 +29,12 @@ environment.systemPackages = [ cfg.package - (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { - name = "clash-verge"; - package = cfg.package; - })) + (lib.mkIf cfg.autoStart ( + pkgs.makeAutostartItem { + name = "clash-verge"; + package = cfg.package; + } + )) ]; security.wrappers.clash-verge = lib.mkIf cfg.tunMode { diff --git a/pkgs/by-name/cl/clash-verge/package.nix b/pkgs/by-name/cl/clash-verge/package.nix deleted file mode 100644 index 9d9aca7cb1fc..000000000000 --- a/pkgs/by-name/cl/clash-verge/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, dpkg -, wrapGAppsHook3 -, autoPatchelfHook -, clash-meta -, openssl -, webkitgtk -, udev -, libayatana-appindicator -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "clash-verge"; - version = "1.3.8"; - - src = fetchurl { - url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8="; - }; - - nativeBuildInputs = [ - dpkg - wrapGAppsHook3 - autoPatchelfHook - ]; - - buildInputs = [ - openssl - webkitgtk - stdenv.cc.cc - ]; - - runtimeDependencies = [ - (lib.getLib udev) - libayatana-appindicator - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mv usr/* $out - - runHook postInstall - ''; - - postFixup = '' - rm -f $out/bin/clash - ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram} - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Clash GUI based on tauri"; - homepage = "https://github.com/zzzgydi/clash-verge"; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ zendo ]; - mainProgram = "clash-verge"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8a883f079d7a..d261728a53c2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -263,6 +263,7 @@ mapAliases ({ crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09