From b004a052f1550da820bc7af216f1a8fb531b7bf8 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 13 Jul 2025 19:24:45 -0600
Subject: [PATCH 1/3] eddie: 2.24.4 -> 2.24.6

https://github.com/AirVPN/Eddie/releases/tag/2.24.6
---
 pkgs/by-name/ed/eddie/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 104733fdb62a..46d16d3e331e 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -28,15 +28,13 @@
 
 buildDotnetModule rec {
   pname = "eddie";
-  version = "2.24.4";
+  version = "2.24.6";
 
   src = fetchFromGitHub {
     owner = "AirVPN";
     repo = "Eddie";
-    # Upstream uses the summaries of commits for
-    # specifying the versions of experimental builds
-    rev = "aeaa7e594d71610dd2c231a8dc5c5aaddc89a7c1";
-    hash = "sha256-AlnWqrKoZb4s4MfPClxlEqzKIOwWL/frA+dx2kCNwW4=";
+    tag = version;
+    hash = "sha256-XSLxjF2k9cw+cx6KzFIQHtjDWqLT2V49KRw+oIyxM5M=";
   };
 
   patches = [

From 40081f3ceda4853e065fb765d34db3f53bd87b2a Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 13 Jul 2025 19:36:57 -0600
Subject: [PATCH 2/3] eddie: `rec` -> `finalAttrs`

---
 pkgs/by-name/ed/eddie/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 46d16d3e331e..3fd05a7bfcb9 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -26,14 +26,14 @@
   testers,
 }:
 
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: {
   pname = "eddie";
   version = "2.24.6";
 
   src = fetchFromGitHub {
     owner = "AirVPN";
     repo = "Eddie";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-XSLxjF2k9cw+cx6KzFIQHtjDWqLT2V49KRw+oIyxM5M=";
   };
 
@@ -75,7 +75,7 @@ buildDotnetModule rec {
 
   makeWrapperArgs = [
     "--add-flags \"--path.resources=${placeholder "out"}/share/eddie-ui\""
-    "--prefix PATH : ${nativeRuntimeInputs}"
+    "--prefix PATH : ${finalAttrs.nativeRuntimeInputs}"
   ];
 
   executables = [ "eddie-cli" ];
@@ -120,7 +120,7 @@ buildDotnetModule rec {
 
     makeWrapper "${mono}/bin/mono" $out/bin/eddie-ui \
       --add-flags $out/lib/eddie-ui/App.Forms.Linux.exe \
-      --prefix LD_LIBRARY_PATH : ${runtimeInputs} \
+      --prefix LD_LIBRARY_PATH : ${finalAttrs.runtimeInputs} \
       ''${makeWrapperArgs[@]}
   '';
 
@@ -139,4 +139,4 @@ buildDotnetModule rec {
     maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
-}
+})

From cdd1f34595ac443dd1219ec2d32e4f1ccfc8a087 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 13 Jul 2025 19:25:28 -0600
Subject: [PATCH 3/3] eddie: add ryand56 as maintainer

---
 pkgs/by-name/ed/eddie/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 3fd05a7bfcb9..e0dc42e2bd32 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -136,7 +136,9 @@ buildDotnetModule (finalAttrs: {
     homepage = "https://eddie.website";
     license = lib.licenses.gpl3Plus;
     mainProgram = "eddie-ui";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      ryand56
+    ];
     platforms = lib.platforms.linux;
   };
 })