From fb067171b249c3b80fec8098e94e5a69966faf6a Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 3 Jul 2024 14:38:29 +0800 Subject: [PATCH 1/3] clash-verge-rev: 1.6.6 -> 1.7.2 Diff: https://github.com/clash-verge-rev/clash-verge-rev/compare/v1.6.6...v1.7.2 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 67 ++++++++++++++++++--- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 03a42f586f6c..2542e77f7d4b 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -1,19 +1,66 @@ -{ lib -, clash-verge -, fetchurl +{ + lib, + autoPatchelfHook, + clash-meta, + dpkg, + fetchurl, + libayatana-appindicator, + nix-update-script, + openssl, + stdenv, + udev, + webkitgtk, + wrapGAppsHook3, }: -clash-verge.overrideAttrs (old: rec { +stdenv.mkDerivation (finalAttrs: { pname = "clash-verge-rev"; - version = "1.6.6"; + version = "1.7.2"; src = fetchurl { - url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-x+Xkasg6Yzft5CLg2YFCRkgpDeiVvvdmcLjrg+oIOT8="; + url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb"; + hash = "sha256-AYWX2kfknhKZ7gmi50mu9VM3kz+Rufwpyt2QTyD4wUo="; }; - meta = old.meta // (with lib; { + nativeBuildInputs = [ + dpkg + wrapGAppsHook3 + autoPatchelfHook + ]; + + buildInputs = [ + openssl + webkitgtk + ]; + + runtimeDependencies = [ + (lib.getLib udev) + libayatana-appindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/* $out + + runHook postInstall + ''; + + postFixup = '' + rm -f $out/bin/verge-mihomo + ln -sf ${lib.getExe clash-meta} $out/bin/verge-mihomo + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Clash GUI based on tauri"; homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; - maintainers = with maintainers; [ Guanran928 ]; - }); + license = lib.licenses.gpl3Plus; + mainProgram = "clash-verge"; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }) From 86a2155671e2e3546abe3c6433b9c36a2452ed0e Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 6 Jul 2024 21:58:23 +0800 Subject: [PATCH 2/3] clash-verge-rev: 1.7.2 -> 1.7.3 Diff: https://github.com/clash-verge-rev/clash-verge-rev/compare/v1.7.2...v1.7.3 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 2542e77f7d4b..e74aecb704c4 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "clash-verge-rev"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb"; - hash = "sha256-AYWX2kfknhKZ7gmi50mu9VM3kz+Rufwpyt2QTyD4wUo="; + hash = "sha256-fFEQ3CS+BeeRFvjS5/SLP8KQCipkpDGH5my11YmgJdo="; }; nativeBuildInputs = [ From 2cb9c4d94c3be5a5992524225bdbb8fa47037cb6 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 17 Jul 2024 17:29:23 +0800 Subject: [PATCH 3/3] clash-verge-rev: 1.7.3 -> 1.7.5 Diff: https://github.com/clash-verge-rev/clash-verge-rev/compare/v1.7.3...v1.7.5 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index e74aecb704c4..5474d3602866 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "clash-verge-rev"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb"; - hash = "sha256-fFEQ3CS+BeeRFvjS5/SLP8KQCipkpDGH5my11YmgJdo="; + hash = "sha256-pVEP+A4W6xLShFXuXPA6P+HZT8Hqkj/HRW2LaOOBI6U="; }; nativeBuildInputs = [