stelliberty: 2.0.25 -> 2.0.36

This commit is contained in:
chillcicada
2026-09-30 17:38:10 +08:00
parent 0a76c84d33
commit 60457743e4
3 changed files with 66 additions and 2470 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,8 @@
[
{
"pname": "Avalonia",
"version": "12.1.1",
"hash": "sha256-GTv2rouQKTrLcryoodYujka0YKSFJ/Xx8Y9ikHPZ130="
"version": "12.1.2",
"hash": "sha256-mZh0FMY6w5kzRqhKhSAG35Y/+Dn5bRQFV+4x+IUNsI8="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@@ -21,78 +21,73 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "12.1.0",
"hash": "sha256-oq1powrap87bypo0K2APlecS1AGxS/9s4MGAlyLLVpo="
"version": "12.1.2",
"hash": "sha256-wK+8S+PYFJahG6gJDx0oKB4e+ltfsPEq11vWCv+XFIc="
},
{
"pname": "Avalonia.Controls.DataGrid",
"version": "12.1.0",
"hash": "sha256-ivrjda3meZJMpoCglss5cYXxeldsR8li76tILwNQO/g="
"version": "12.1.2",
"hash": "sha256-EKv+UnSScgONwbIY9NLTRHyGlK9QTCvXIT/bFP+13Go="
},
{
"pname": "Avalonia.Desktop",
"version": "12.1.1",
"hash": "sha256-b7yunwfT7+hBPzW3hh+PX6s8sYpVfIpum7QxPiUNQAA="
"version": "12.1.2",
"hash": "sha256-wsNZFYW6jH9D8fx54xwAEsbpjqGsxzwbGlj+MVf2ZHo="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "12.1.1",
"hash": "sha256-w61F1fA/RZdT25xtJWRes2SEYS1ixc797cUOfRu4tmM="
"version": "12.1.2",
"hash": "sha256-Esxo2rYv/MSVmdWqY5nu1Vd4YcAr87mg4o56maQaaSs="
},
{
"pname": "Avalonia.FreeDesktop.AtSpi",
"version": "12.1.1",
"hash": "sha256-c+B2eV5v/gZgBZqj4Z1QeJbHgyPJEenyFCutiQBUwRU="
"version": "12.1.2",
"hash": "sha256-XMWyVgn3S5x9Z0fzffD2lSQvhJKMCjLDUlFizUqp4aQ="
},
{
"pname": "Avalonia.HarfBuzz",
"version": "12.1.1",
"hash": "sha256-7lChqcimsELWLlx3J1VhHJq3V0AoZ5iSHstZrT7ItBA="
"version": "12.1.2",
"hash": "sha256-M2+qSEJk3MncUvFQmA5I5S+Vjf7o5aHnpgXqbbrVT2s="
},
{
"pname": "Avalonia.Markup.Xaml.Loader",
"version": "12.1.1",
"hash": "sha256-fXiI8x0OwFa8SRkvSXa7lOWZ3XnhJE1b0gIxCeUeVE0="
"version": "12.1.2",
"hash": "sha256-8VAbYPw2S+Y1y9CwSnKxCzWTpb13IDFcZtkygyUPoDA="
},
{
"pname": "Avalonia.Native",
"version": "12.1.1",
"hash": "sha256-1VfWF3vFifgBiuM1LV6v6s6Dbh0uUQ+CHL3PxmtWlVI="
"version": "12.1.2",
"hash": "sha256-46paePGddiQlQqvy6fg/QLmlKaV6B1tDbckd/pRYWMk="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "12.1.0",
"hash": "sha256-PXrrCyFLIdrcEnNUz2ZzjFjs65hVaxEm5h/ux8tOo0k="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "12.1.1",
"hash": "sha256-Ewx9x7XsVrmv3Z2TkqVzTASxloSijLftrkYB9YK5MBE="
"version": "12.1.2",
"hash": "sha256-IPuepoUzVR+llgU9CInvkrTYW00CVHdzewzE6QYcZV0="
},
{
"pname": "Avalonia.Skia",
"version": "12.1.1",
"hash": "sha256-9oPb5fXc395iy4vuDMdeO5vsldn5JHlso2J72ov6TyU="
"version": "12.1.2",
"hash": "sha256-K4vnkvwFFGdbPKzpfD+MCKbY3fmmCMroSzJanPVlI0A="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "12.1.1",
"hash": "sha256-YnRV5nn276iYP7PfbX+u9K3xpD3RX4jN80K3rvHEbbQ="
"version": "12.1.2",
"hash": "sha256-wBngLXs5jn3Pk+UWz+uz9ftGPOStpt++NQTHswsvPr8="
},
{
"pname": "Avalonia.Win32",
"version": "12.1.1",
"hash": "sha256-4jzrk/5p3/WF6/ZyaI07TL4O4HM8NnjaHk71H7H6GUw="
"version": "12.1.2",
"hash": "sha256-vcVvzUkvG7ByiuTKuN0ZhrRZYyW8ynNIdVkHkLUZYII="
},
{
"pname": "Avalonia.X11",
"version": "12.1.1",
"hash": "sha256-/D2+LG3fiOeKprFV82EMzNoKfxSXfh3pDvb+MzNl4Kg="
"version": "12.1.2",
"hash": "sha256-lu2v/wUT7MGeCood/qfjizTrf8Bq1Nd/wpjcrrdMWOw="
},
{
"pname": "Fody",
"version": "6.9.2",
"hash": "sha256-rQAVA3ybnZhbX/n5QaMEg0qbM2fKTOHcLLr84CQt1G0="
"version": "6.9.3",
"hash": "sha256-JLom3mbO4NCUXDHoU86l720QXlRx52+ROb5wBwcC5nM="
},
{
"pname": "HarfBuzzSharp",
@@ -121,23 +116,23 @@
},
{
"pname": "HotAvalonia",
"version": "3.1.4",
"hash": "sha256-ugCFW1L5x5I0x8zQfLCQN1sWRJT2DnLci683i64SkYQ="
"version": "3.1.5",
"hash": "sha256-TMahveJjt0u7TcUrPJrTlriCrcq++TTc1sQwHw5Kxkc="
},
{
"pname": "HotAvalonia.Core",
"version": "3.1.4",
"hash": "sha256-GjpCVdh1FMS0toM0jRkmnz7YJsIx3dRN3mMSAnL4e2Y="
"version": "3.1.5",
"hash": "sha256-S4JY4oOUkbjP9i7JIK/q7RhxGrhTk0Hfjzz8PWWPZNY="
},
{
"pname": "HotAvalonia.Extensions",
"version": "3.1.4",
"hash": "sha256-U840VOosck7dfH+jgYQTOxB2DZN7O+87xKBKkAOXkwQ="
"version": "3.1.5",
"hash": "sha256-KnOa2lk04lhSA06NEqWy5kd58aQ54NKPg/+DQ1faBJM="
},
{
"pname": "HotAvalonia.Fody",
"version": "3.1.4",
"hash": "sha256-mDHZCH5J9tqfvmn0KVhj3St3BLP7MPm18tJf0fQWkE0="
"version": "3.1.5",
"hash": "sha256-aJozwL9VBPoNkj2tYwJAOBfIjPQxh8gjNGVMDB3brY4="
},
{
"pname": "IconPacks.Avalonia.Core",
@@ -153,8 +148,8 @@
},
{
"pname": "Irihi.Avalonia.Shared",
"version": "0.4.0",
"hash": "sha256-flrIM8LVUYr+3IAL1aRv+F266bBaTDs+M8ra3YG9JTE="
"version": "0.5.0",
"hash": "sha256-9vM4MP0mfoQycEfB5EtXNiubMJtQadHkxqrkP4R6ALE="
},
{
"pname": "MicroCom.Runtime",
@@ -178,8 +173,8 @@
},
{
"pname": "Semi.Avalonia",
"version": "12.1.0",
"hash": "sha256-rSCXZF7JQBmzY7bRo3a0AdjzrtJVVl6kw+pSI76uIjg="
"version": "12.1.0.1",
"hash": "sha256-EhraFSkS4tPoVSz1BE/Jhb/IJtQvJcdqED8emsrI9YY="
},
{
"pname": "Semi.Avalonia.AvaloniaEdit",
@@ -188,13 +183,13 @@
},
{
"pname": "Semi.Avalonia.ColorPicker",
"version": "12.1.0",
"hash": "sha256-Bk6UgtUFsrioqVNnIpD4hKYaZdMuBShDiYuZleHklr0="
"version": "12.1.0.1",
"hash": "sha256-+/1k/USjNQCWA083bMXHGrolml5+/Ev42DIgEcPdsS8="
},
{
"pname": "Semi.Avalonia.DataGrid",
"version": "12.1.0",
"hash": "sha256-YsqH7gD4nK0WOjspUwp7hC6CLXZg9X8IH5BiN4/ZKQQ="
"version": "12.1.0.1",
"hash": "sha256-N/M6G15SwRiHwnYpUs7J971SF/AS8+i3087NZOHySpY="
},
{
"pname": "SkiaSharp",
@@ -241,6 +236,11 @@
"version": "0.94.1",
"hash": "sha256-T3HQasQOcl/7zxt5hT3ZMhhpWoTyPTb6/IX0d6TJWA8="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.95.1",
"hash": "sha256-LUum1jB4RxzgfoqwxKoTRe7UdhTikbBh5Em7g4gvp3U="
},
{
"pname": "YamlDotNet",
"version": "18.1.0",

View File

@@ -38,7 +38,7 @@ in
buildDotnetModule (finalAttrs: {
pname = "stelliberty";
version = "2.0.25";
version = "2.0.36";
strictDeps = true;
__structuredAttrs = true;
@@ -47,10 +47,13 @@ buildDotnetModule (finalAttrs: {
owner = "Kindness-Kismet";
repo = "stelliberty";
tag = "v${finalAttrs.version}";
hash = "sha256-WlIUBxLRZUDBONOxviFb2HWBcC2aBqWsvu/KB4igdwU=";
hash = "sha256-uTFeFoGvQ15CGJVkTO6IrdnwRlU7KB5xKvHS9pZyhrk=";
};
projectFile = "src/Stelliberty.Desktop/Stelliberty.Desktop.csproj";
projectFile = [
"src/Stelliberty.Tray/Stelliberty.Tray.csproj"
"src/Stelliberty.Desktop/Stelliberty.Desktop.csproj"
];
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_11_0;
@@ -58,22 +61,20 @@ buildDotnetModule (finalAttrs: {
executables = [ "stelliberty" ];
postPatch = ''
substituteInPlace src/Stelliberty.Application/Platform/PortableDataDirectoryResolver.cs \
--replace-fail "InstallDataDirectory(baseDirectory)" \
"Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), \"stelliberty\"))"
substituteInPlace Directory.Build.props \
--replace-fail "<TreatWarningsAsErrors>true</TreatWarningsAsErrors>" ""
substituteInPlace native/hub/src/infra/paths.rs \
--replace-fail "data_core_dir.join" "user_data_dir.join"
substituteInPlace native/service/src/core.rs \
--replace-fail "service_data_root()?.join(\"service\")" "std::env::temp_dir().join(\"stelliberty_service\")"
ln -s ${./Cargo.lock} Cargo.lock
'';
# the upstream does not provide a Cargo.lock
# https://github.com/Kindness-Kismet/stelliberty/issues/99#issuecomment-5079064300
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-p7aLfalSxEEc2qakMXLuW7adWirFPzIjDZbdGP9ilaw=";
};
nativeBuildInputs = [
stdenv.cc # cc-rs
@@ -123,6 +124,8 @@ buildDotnetModule (finalAttrs: {
ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/stelliberty/data/core/geosite.dat
ln -s ${lib.getExe mihomo} $out/lib/stelliberty/data/core/clash-mihomo-core
ln -s $out/lib/stelliberty/stelliberty_ui $out/lib/stelliberty/data/deps/stelliberty_ui
install -Dm755 target/${stdenv.hostPlatform.rust.rustcTarget}/release/stelliberty_service \
$out/lib/stelliberty/data/service/update/release/stelliberty_service
@@ -157,12 +160,7 @@ buildDotnetModule (finalAttrs: {
})
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--generate-lockfile"
"--use-github-releases"
];
};
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "Cross-platform desktop proxy client";