From 5a730f1dd1bfc9df9af5dde516e2124483b225a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 19:53:58 +0000
Subject: [PATCH 1/3] warp-plus: 1.2.6-unstable-2025-09-13 ->
 1.2.6-unstable-2025-10-28

---
 pkgs/by-name/wa/warp-plus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index d8a12f381140..5257c82f64d1 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "warp-plus";
-  version = "1.2.6-unstable-2025-09-13";
+  version = "1.2.6-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "4af9b2abfc4e79dceea41ac577f1683f62f57b8c";
-    hash = "sha256-7i/06Qn+BRH/bWel9OvgVUAZZSwL2Euv179JDJNn2EE=";
+    rev = "3653f7519d2a08a36222accff6899522bb8b03d0";
+    hash = "sha256-T0YTxQ7iciv5i7lw+bU00B6iYquzBwzYkAlOGZiKeWc=";
   };
 
   vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";

From 14b11b6a9cb214136bb0d3fc6c2a41e3bf4ffa5e Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 30 Oct 2025 11:48:16 +0530
Subject: [PATCH 2/3] warp-plus: use go_1_24

Drop -w from ldflags because -s already implies -w
Move to finalAttrs pattern

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 5257c82f64d1..f52fb5b94622 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
 
   nix-update-script,
@@ -8,7 +8,9 @@
   warp-plus,
 }:
 
-buildGoModule rec {
+# fails with go 1.25, downgrade to 1.24
+# error tls.ConnectionState: struct field count mismatch: 17 vs 16
+buildGo124Module (finalAttrs: {
   pname = "warp-plus";
   version = "1.2.6-unstable-2025-10-28";
 
@@ -23,8 +25,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   patches = [
@@ -59,4 +60,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "warp-plus";
   };
-}
+})

From eaa870433641e2581921c56b8e0d38a797160dc9 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 31 Oct 2025 13:03:34 +0530
Subject: [PATCH 3/3] warp-plus: prefer versionCheckHook instead of
 testers.testVersion

add changelog entry in package meta

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index f52fb5b94622..306d24e41939 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
 
   nix-update-script,
-  testers,
-  warp-plus,
+  versionCheckHook,
 }:
 
 # fails with go 1.25, downgrade to 1.24
@@ -45,15 +44,14 @@ buildGo124Module (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-    tests.version = testers.testVersion {
-      package = warp-plus;
-      command = "warp-plus version";
-    };
-  };
+  nativeCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
+    changelog = "https://github.com/bepass-org/warp-plus/releases";
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;