From ac0f4780df82dbfa8b292b7ccbac2881ddfbe97d Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 21 Aug 2026 23:42:27 -0600 Subject: [PATCH] eddie: 2.24.6 -> 2.26.2 --- pkgs/by-name/ed/eddie/package.nix | 17 ++++++++-------- .../eddie/remove-impure-integrity-check.patch | 20 +++++++++++++++++++ ...-the-postbuild-from-the-project-file.patch | 19 +++++------------- 3 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/ed/eddie/remove-impure-integrity-check.patch diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index f811a888dcd7..f4ad11d0d898 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -29,25 +29,26 @@ buildDotnetModule (finalAttrs: { pname = "eddie"; - version = "2.24.6"; + version = "2.26.2"; src = fetchFromGitHub { owner = "AirVPN"; repo = "Eddie"; - tag = finalAttrs.version; - hash = "sha256-XSLxjF2k9cw+cx6KzFIQHtjDWqLT2V49KRw+oIyxM5M="; + tag = "v${finalAttrs.version}"; + hash = "sha256-G3geXoZAd8gf6HnKboadDL/QLlO9d4fd0rNEnViobhY="; }; patches = [ ./dont-set-rpath-in-eddie-tray.patch ./remove-the-postbuild-from-the-project-file.patch + ./remove-impure-integrity-check.patch ]; - projectFile = [ "src/App.CLI.Linux/App.CLI.Linux.net8.csproj" ]; + projectFile = [ "src/App.CLI.Linux/App.CLI.Linux.net10.csproj" ]; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; nativeBuildInputs = [ gcc @@ -142,9 +143,7 @@ buildDotnetModule (finalAttrs: { homepage = "https://eddie.website"; license = lib.licenses.gpl3Plus; mainProgram = "eddie-ui"; - maintainers = with lib.maintainers; [ - ryand56 - ]; + maintainers = [ lib.maintainers.ryand56 ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ed/eddie/remove-impure-integrity-check.patch b/pkgs/by-name/ed/eddie/remove-impure-integrity-check.patch new file mode 100644 index 000000000000..b97b0b1beea8 --- /dev/null +++ b/pkgs/by-name/ed/eddie/remove-impure-integrity-check.patch @@ -0,0 +1,20 @@ +diff --git a/src/Lib.CLI.Elevated/src/ibase.cpp b/src/Lib.CLI.Elevated/src/ibase.cpp +index 3f002048cf..c1814cd2af 100644 +--- a/src/Lib.CLI.Elevated/src/ibase.cpp ++++ b/src/Lib.CLI.Elevated/src/ibase.cpp +@@ -427,15 +427,6 @@ + if (clientProcessId != GetSpotClientPid()) + ThrowException("Client not allowed: Spot mode, client PID mismatch"); + } +- +-#if defined(Debug) || defined(_DEBUG) +-#else +- if (true) +- { +- if (IntegrityCheckFileKnown(clientProcessPath) == false) +- ThrowException("Client not allowed: Integrity check failed "); +- } +-#endif + } + + ReplyPID(GetCurrentProcessId()); diff --git a/pkgs/by-name/ed/eddie/remove-the-postbuild-from-the-project-file.patch b/pkgs/by-name/ed/eddie/remove-the-postbuild-from-the-project-file.patch index 4efa78888d8f..69fef09cd434 100644 --- a/pkgs/by-name/ed/eddie/remove-the-postbuild-from-the-project-file.patch +++ b/pkgs/by-name/ed/eddie/remove-the-postbuild-from-the-project-file.patch @@ -1,19 +1,10 @@ -From bfe8a4e0d75b97cf646818bfba52dfdbc3c4274c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Fri, 6 Dec 2024 22:42:40 +0300 -Subject: [PATCH 1/2] Remove the postbuild from the project file. - ---- - src/App.CLI.Linux/App.CLI.Linux.net8.csproj | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/App.CLI.Linux/App.CLI.Linux.net8.csproj b/src/App.CLI.Linux/App.CLI.Linux.net8.csproj +diff --git a/src/App.CLI.Linux/App.CLI.Linux.net10.csproj b/src/App.CLI.Linux/App.CLI.Linux.net10.csproj index 8d53d36..b4b3822 100644 ---- a/src/App.CLI.Linux/App.CLI.Linux.net8.csproj -+++ b/src/App.CLI.Linux/App.CLI.Linux.net8.csproj +--- a/src/App.CLI.Linux/App.CLI.Linux.net10.csproj ++++ b/src/App.CLI.Linux/App.CLI.Linux.net10.csproj @@ -50,9 +50,4 @@ - - + + - -