v2rayn: 7.11.1 -> 7.12.5

Diff: https://github.com/2dust/v2rayN/compare/refs/tags/7.11.1...refs/tags/7.12.5
This commit is contained in:
emaryn 2025-05-28 15:52:46 +08:00
parent cea9d2ce38
commit 4cb3d98c05
2 changed files with 46 additions and 40 deletions

View file

@ -11,8 +11,8 @@
}, },
{ {
"pname": "Avalonia", "pname": "Avalonia",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI=" "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
}, },
{ {
"pname": "Avalonia.Angle.Windows.Natives", "pname": "Avalonia.Angle.Windows.Natives",
@ -31,38 +31,38 @@
}, },
{ {
"pname": "Avalonia.Controls.ColorPicker", "pname": "Avalonia.Controls.ColorPicker",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ=" "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
}, },
{ {
"pname": "Avalonia.Controls.DataGrid", "pname": "Avalonia.Controls.DataGrid",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI=" "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
}, },
{ {
"pname": "Avalonia.Desktop", "pname": "Avalonia.Desktop",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24=" "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
}, },
{ {
"pname": "Avalonia.Diagnostics", "pname": "Avalonia.Diagnostics",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ=" "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
}, },
{ {
"pname": "Avalonia.FreeDesktop", "pname": "Avalonia.FreeDesktop",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ=" "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
}, },
{ {
"pname": "Avalonia.Native", "pname": "Avalonia.Native",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw=" "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
}, },
{ {
"pname": "Avalonia.ReactiveUI", "pname": "Avalonia.ReactiveUI",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU=" "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
}, },
{ {
"pname": "Avalonia.Remote.Protocol", "pname": "Avalonia.Remote.Protocol",
@ -76,28 +76,28 @@
}, },
{ {
"pname": "Avalonia.Remote.Protocol", "pname": "Avalonia.Remote.Protocol",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ=" "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
}, },
{ {
"pname": "Avalonia.Skia", "pname": "Avalonia.Skia",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c=" "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
}, },
{ {
"pname": "Avalonia.Themes.Simple", "pname": "Avalonia.Themes.Simple",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA=" "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
}, },
{ {
"pname": "Avalonia.Win32", "pname": "Avalonia.Win32",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY=" "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
}, },
{ {
"pname": "Avalonia.X11", "pname": "Avalonia.X11",
"version": "11.2.6", "version": "11.3.0",
"hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw=" "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
}, },
{ {
"pname": "CliWrap", "pname": "CliWrap",
@ -196,13 +196,13 @@
}, },
{ {
"pname": "Semi.Avalonia", "pname": "Semi.Avalonia",
"version": "11.2.1.6", "version": "11.2.1.7",
"hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE=" "hash": "sha256-LFlgdRcqNR+ZV9Hkyuw7LhaFWKwCuXWRWYM+9sQRBDU="
}, },
{ {
"pname": "Semi.Avalonia.DataGrid", "pname": "Semi.Avalonia.DataGrid",
"version": "11.2.1.6", "version": "11.2.1.7",
"hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo=" "hash": "sha256-EWfzKeM5gMoJHx7L9+kAeGtaaY6HeG+NwAxv08rOv6E="
}, },
{ {
"pname": "SkiaSharp", "pname": "SkiaSharp",
@ -336,8 +336,8 @@
}, },
{ {
"pname": "Tmds.DBus.Protocol", "pname": "Tmds.DBus.Protocol",
"version": "0.20.0", "version": "0.21.2",
"hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
}, },
{ {
"pname": "WebDav.Client", "pname": "WebDav.Client",

View file

@ -1,18 +1,18 @@
{ {
fetchFromGitHub, lib,
stdenv,
buildDotnetModule, buildDotnetModule,
fetchFromGitHub,
dotnetCorePackages, dotnetCorePackages,
autoPatchelfHook,
copyDesktopItems,
makeDesktopItem,
icu, icu,
zlib, zlib,
stdenv,
lib,
fontconfig, fontconfig,
autoPatchelfHook,
openssl, openssl,
lttng-ust_2_12, lttng-ust_2_12,
krb5, krb5,
makeDesktopItem,
copyDesktopItems,
bash, bash,
xorg, xorg,
xdg-utils, xdg-utils,
@ -21,13 +21,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "v2rayn"; pname = "v2rayn";
version = "7.11.1"; version = "7.12.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "2dust"; owner = "2dust";
repo = "v2rayN"; repo = "v2rayN";
tag = version; tag = version;
hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0="; hash = "sha256-gXVriD9g4Coc0B0yN5AlfNre9C9l8V5wv4q3KgKRsF0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -36,12 +36,18 @@ buildDotnetModule rec {
nugetDeps = ./deps.json; nugetDeps = ./deps.json;
postPatch = '' postPatch = ''
chmod +x v2rayN/ServiceLib/Sample/proxy_set_linux_sh
patchShebangs v2rayN/ServiceLib/Sample/proxy_set_linux_sh
substituteInPlace v2rayN/ServiceLib/Global.cs \ substituteInPlace v2rayN/ServiceLib/Global.cs \
--replace-fail "/bin/bash" "${bash}/bin/bash" --replace-fail "/bin/bash" "${bash}/bin/bash"
substituteInPlace v2rayN/ServiceLib/Handler/CoreAdminHandler.cs \
--replace-fail "/bin/sh" "${bash}/bin/bash"
substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \ substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
--replace-fail "Utils.GetExePath())" '"v2rayN")' --replace-fail "Utils.GetExePath())" '"v2rayN")'
substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \ substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
--replace-fail "nautilus" "${xdg-utils}/bin/xdg-open" --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
substituteInPlace v2rayN/ServiceLib/Handler/CoreHandler.cs \
--replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
''; '';
dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ]; dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ];