From 61f32bfa7f4f403203fbbb193e71aa4e19a16236 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 22 Aug 2025 00:04:36 +0300
Subject: [PATCH] gnu: go-1.24: Inherit from go-1.22.

* gnu/packages/golang.scm (go-1.24)[arguments]: Replace inherited
'disable-more-tests phase to adjust for changes in the source.
[native-inputs]: Rewrite inheriting from go-1.22.
[properties]: Add field previously inherited from go-1.23.

Change-Id: I4938c7854cba0aa982d7b755c10f255cab81a828
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang.scm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 859a756ba5724a92ed6bfb05bdbd2727755fcf71..0c53302d4ed906af6401f72ba85353907f5de267 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1134,7 +1134,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 
 (define-public go-1.24
   (package
-    (inherit go-1.23)
+    (inherit go-1.22)
     (name "go")
     (version "1.24.3")
     (source
@@ -1146,9 +1146,31 @@ in the style of communicating sequential processes (@dfn{CSP}).")
        (file-name (git-file-name name version))
        (sha256
         (base32 "1b24pdsxrarw22gffv85sghpgvgamafvwwrvvhmyv3hqf89m97zk"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments go-1.22)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'disable-more-tests
+              (lambda _
+                #$@(cond
+                     ((target-aarch64?)
+                      ;; https://go-review.googlesource.com/c/go/+/151303
+                      ;; This test is known buggy on aarch64 and is enabled and
+                      ;; disabled upstream with some regularity.
+                      #~((substitute* "src/plugin/plugin_test.go"
+                           (("package plugin_test")
+                            (string-append "// +build !linux linux,!arm64\n\n"
+                                           "package plugin_test")))))
+                     (else (list #t)))))))))
     (native-inputs
      ;; Go 1.24 and later requires Go 1.22+ as the bootstrap toolchain.
-     (alist-replace "go" (list go-1.22) (package-native-inputs go-1.23)))))
+     (alist-replace "go" (list go-1.22) (package-native-inputs go-1.22)))
+    (properties
+     `((compiler-cpu-architectures
+         ("aarch64" ,@%go-1.23-arm64-micro-architectures)
+         ("armhf" ,@%go-1.17-arm-micro-architectures)
+         ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
+         ("x86_64" ,@%go-1.18-x86_64-micro-architectures))))))
 
 ;;
 ;; Default Golang version used in guix/build-system/go.scm to build packages.