Subject: bug#50885: closed (Re: bug#50885: [PATCH] import: go: Recognize major version suffixes.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 04 Oct 2021 14:09:02 +0000

Your bug report

#50885: [PATCH] import: go: Recognize major version suffixes.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
50885: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=50885
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#50885: [PATCH] import: go: Recognize major version suffixes.
From: Ludovic Courtès <[email-masked]>
To: Sarah Morgensen <[email-masked]>
Cc: [email-masked]
Date: Mon, 04 Oct 2021 16:08:29 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Sarah Morgensen <[email-masked]> skribis:

> Do not treat major version suffixes (such as "/v3") as repository
> subdirectories.  See <https://golang.org/ref/mod#major-version-suffixes>.
>
> * guix/import/go.scm (go-module->guix-package): When determining the
> unpack path, compare 'root-module-path' to 'module-path-sans-suffix'
> instead of 'module-path'.

Applied as well, but I feel that it may be useful to have tests for
these fine points that where regressions would otherwise be hard to
notice.

Thanks,
Ludo’.

Subject: [PATCH] import: go: Recognize major version suffixes.
From: Sarah Morgensen <[email-masked]>
To: [email-masked]
Date: Tue, 28 Sep 2021 19:59:32 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

Do not treat major version suffixes (such as "/v3") as repository
subdirectories.  See <https://golang.org/ref/mod#major-version-suffixes>.

* guix/import/go.scm (go-module->guix-package): When determining the
unpack path, compare 'root-module-path' to 'module-path-sans-suffix'
instead of 'module-path'.
---
 guix/import/go.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/import/go.scm b/guix/import/go.scm
index ca909ab35a..26dbc34b63 100644
--- a/guix/import/go.scm
+++ b/guix/import/go.scm
@@ -612,6 +612,8 @@ hint: use one of the following available versions ~a\n"
          (dependencies (if pin-versions?
                            dependencies+versions
                            (map car dependencies+versions)))
+         (module-path-sans-suffix
+          (match:prefix (string-match "([\\./]v[0-9]+)?$" module-path)))
          (guix-name (go-module->guix-package-name module-path))
          (root-module-path (module-path->repository-root module-path))
          ;; The VCS type and URL are not included in goproxy information. For
@@ -631,7 +633,7 @@ hint: use one of the following available versions ~a\n"
         (build-system go-build-system)
         (arguments
          '(#:import-path ,module-path
-           ,@(if (string=? module-path root-module-path)
+           ,@(if (string=? module-path-sans-suffix root-module-path)
                  '()
                  `(#:unpack-path ,root-module-path))))
         ,@(maybe-propagated-inputs

base-commit: c582be4c38596a6a31a39c6799723dcd8b6eb909
prerequisite-patch-id: dbb8a05982f57aefffd5b97ab3dac4073b48245d
-- 
2.33.0