From 14b11b6a9cb214136bb0d3fc6c2a41e3bf4ffa5e Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Thu, 30 Oct 2025 11:48:16 +0530 Subject: [PATCH] warp-plus: use go_1_24 Drop -w from ldflags because -s already implies -w Move to finalAttrs pattern Signed-off-by: phanirithvij --- 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"; }; -} +})