diff --git a/pkgs/by-name/go/goconvey/package.nix b/pkgs/by-name/go/goconvey/package.nix
index 8b2d69f3bbf4..dc4992e8a06e 100644
--- a/pkgs/by-name/go/goconvey/package.nix
+++ b/pkgs/by-name/go/goconvey/package.nix
@@ -1,26 +1,36 @@
 {
   lib,
   fetchFromGitHub,
-  # Build fails with Go 1.25, with the following error:
-  # 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
-  # Wait for upstream to update their vendored dependencies before unpinning.
-  buildGo124Module,
+  fetchpatch,
+  applyPatches,
+  buildGoModule,
 }:
 
-buildGo124Module {
+buildGoModule {
   pname = "goconvey";
   version = "1.8.1-unstable-2024-03-06";
 
   excludedPackages = "web/server/watch/integration_testing";
 
-  src = fetchFromGitHub {
-    owner = "smartystreets";
-    repo = "goconvey";
-    rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988";
-    hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo=";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "smartystreets";
+      repo = "goconvey";
+      rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988";
+      hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo=";
+    };
+    patches = [
+      # Update golang.org/x/tools to v0.42.0 for Go 1.25+ compatibility
+      # https://github.com/smartystreets/goconvey/pull/703
+      (fetchpatch {
+        url = "https://github.com/smartystreets/goconvey/commit/a8d73b2e5380902ab6caa6716ad69c324f390a2d.patch";
+        hash = "sha256-4JZs4/kxt3KP21q4U8mpBJkueVmRsCsKqST1Cn6ySN8=";
+      })
+    ];
   };
 
-  vendorHash = "sha256-P4J/CZY95ks08DC+gSqG+eanL3zoiaoz1d9/ZvBoc9Q=";
+  proxyVendor = true;
+  vendorHash = "sha256-0LQ5yxqy+WGc9TzmXiiHYyUNIIImoLsItkv5KcHjVGc=";
 
   ldflags = [
     "-s"