From e9f76b2ee4320b0dafcc741a5284abbb747d7084 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Thu, 9 Oct 2025 22:39:50 +0100
Subject: [PATCH] gnu: go-github-com-ugorji-go-codec: Fix build.

* gnu/packages/golang-web.scm (go-github-com-ugorji-go-codec)[source]
<snippet>: Remove submodule with it's own go.mod file.
[arguments] <go>: Use default (go-1.24).
<import-path>: Adjust to the one from go.mod.
<unpack-path>: Drop it.
[phases]{remove-benchmarks}: Adjust path to benchmarks.

Change-Id: If1fa03e36075593ee772c5c7b62e57aa2c6dd714
---
 gnu/packages/golang-web.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 08477518fc41dfa563a6de8459e94ad216c47d15..c6ff9752a5ff1946ff9df82fee9fac98350e6db4 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -11022,23 +11022,31 @@ extract data from those paths.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ugorji/go")
-             (commit (string-append "v" version))))
+              (url "https://github.com/ugorji/go")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mny5gm5gr82hz4y6k5ljaa0khjw647ys278wq750fgrbzp6fs8h"))))
+        (base32 "1mny5gm5gr82hz4y6k5ljaa0khjw647ys278wq750fgrbzp6fs8h"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Submodules with their own go.mod files and packaged separately:
+            ;;
+            ;; - github.com/ugorji/go/codec/codecgen
+            (delete-file-recursively "codec/codecgen")))))
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.23
-      #:import-path "github.com/ugorji/go/codec"
-      #:unpack-path "github.com/ugorji/go"
+      #:skip-build? #t
+      #:import-path "github.com/ugorji/go"
+      #:test-flags
+      #~(list "-vet=off")   ;Go@1.24 forces vet, but tests are not ready yet.
       #:phases #~(modify-phases %standard-phases
                    (add-after 'unpack 'remove-benchmarks
                      (lambda* (#:key import-path #:allow-other-keys)
                        (delete-file-recursively (string-append "src/"
                                                                import-path
-                                                               "/bench")))))))
+                                                               "/codec/bench")))))))
     (propagated-inputs (list go-golang-org-x-tools))
     (home-page "https://github.com/ugorji/go")
     (synopsis "Codec and encoding library for various serialization formats")