nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

eddie: 2.24.6 -> 2.26.2

Browse Source
This commit is contained in:
Ryan Omasta
2026-08-21 23:42:27 -06:00
parent bfeca7ad01
commit ac0f4780df
3 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/by-name/ed/eddie/package.nix
View File

@@ -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;
};
})

20
pkgs/by-name/ed/eddie/remove-impure-integrity-check.patch Normal file
View File

@@ -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());

19
pkgs/by-name/ed/eddie/remove-the-postbuild-from-the-project-file.patch
View File

@@ -1,19 +1,10 @@
From bfe8a4e0d75b97cf646818bfba52dfdbc3c4274c Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
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 @@
<ProjectReference Include="..\Lib.Core\Lib.Core.net8.csproj" />
<ProjectReference Include="..\Lib.Platform.Linux\Lib.Platform.Linux.net8.csproj" />
<ProjectReference Include="..\Lib.Core\Lib.Core.net10.csproj" />
<ProjectReference Include="..\Lib.Platform.Linux\Lib.Platform.Linux.net10.csproj" />
</ItemGroup>
-
- <Target Name="LinuxPostBuild" AfterTargets="PostBuildEvent">