Ludovic Courtès <ludo@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 64036) by debbugs.gnu.org; 16 Aug 2023 17:11:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 16 13:11:59 2023 Received: from localhost ([127.0.0.1]:41961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qWK3r-0005QC-EB for submit <at> debbugs.gnu.org; Wed, 16 Aug 2023 13:11:59 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qWK3i-0005NC-4w; Wed, 16 Aug 2023 13:11:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fe8d816a40so10390875e9.1; Wed, 16 Aug 2023 10:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692205904; x=1692810704; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=mPduG9+ksRVkvzA0Qa/2RSlV1qAxQ2THAGkRputDeZg=; b=kf/zrJ6sn6Ce3Oq1u2FvdL+MYum7ZsmvPAkyQHUiLrEjBKympdHsgZynQfGScDOF1o 2BQN3fnzh1HRd5aoaYx6fyircREuPP8gLC31ioVVkE2SHrQCYUrIz3EfnUcQZgFCTfOU W/Y3aGZF9huYCSkRkYqx6mvoQF6bySXdDMOfY2ACbEldc2UDi+q9eMPT79htVNY+gXll 3ZVxKoslNjhu0CxRLF2h7CVmH6wdTAXRGJHYAExX/B7fHK064983xkbUAQCQU/H9C0jW rz9bi0xkre8fRvpLGsZKeLUXkAKkidUp5wBb7pTpW6gQu/2K2y0sNrDOGMmt3LUXh5vR q2mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692205904; x=1692810704; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mPduG9+ksRVkvzA0Qa/2RSlV1qAxQ2THAGkRputDeZg=; b=VbPNIfHCRrbiXpqYynSpl0ik5yE8GIx7z+1CNuj0/hN6YZc58ajBxNUCkVyNRwaVZW MBnYJrkYr/MS65yZiGeImwmxLM+gAftZ04zo2Tx6BfUiHTF/APQaZ7tQIPELMDdZ4T8j Vzd5fDpmJ62US3rgA7P8e+a4JJRNOve+ATE0a6o9kQJ8+0g7Z06xfnyyjt+wO/Nn+7ik zu3kzGUwNzR5YnjaWlu1Jd/Dh9FVd43Z4ion6/xOPPT/itrYscnsYH+3hi40NCST/SUI dGX9TdM+VGd2TpOd/dKSDat7P/xchu+fKQhYUEGH0F7r+BkGCK9fc3+hdnNC6A6RelEi Kfrg== X-Gm-Message-State: AOJu0YyIpJnqhljehCVLaRbnZsK6h/L6ypcU6041Rj8HMugICWyzb1Ph 2wDUzxu6SM07+1vKGCIctrUhy1hzX7w= X-Google-Smtp-Source: AGHT+IHmilbFgjYL6fX4qMtQ41+nKvDUIBegmVp8/JhAgr/rcW2U0mhfwGfdJpaohGClqYJCSLltpQ== X-Received: by 2002:a5d:67cc:0:b0:317:3d36:b2c1 with SMTP id n12-20020a5d67cc000000b003173d36b2c1mr1874230wrw.7.1692205904567; Wed, 16 Aug 2023 10:11:44 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id e15-20020adff34f000000b0031980ae286asm8026512wrp.70.2023.08.16.10.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 10:11:44 -0700 (PDT) From: Simon Tournier <zimon.toutoune@HIDDEN> To: Timo Wilken <guix@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Subject: Re: bug#63001: bug#63631: [PATCH] import: go: Handle subpackage versioning correctly. In-Reply-To: <CTF06XBYWPT0.1MV6QA1B2OB98@HIDDEN> References: <6dd1de3dd4d968876fa55f5126056834c77b0244.1684703258.git.guix@HIDDEN> <87pm5xrbsg.fsf@HIDDEN> <CTF06XBYWPT0.1MV6QA1B2OB98@HIDDEN> Date: Wed, 16 Aug 2023 17:59:53 +0200 Message-ID: <875y5ff05i.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64036 Cc: 63631 <at> debbugs.gnu.org, 64036 <at> debbugs.gnu.org, 63647 <at> debbugs.gnu.org, 64035 <at> debbugs.gnu.org, 63001 <at> debbugs.gnu.org, 54097 <at> debbugs.gnu.org, wolf@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Timo, On Sat, 17 Jun 2023 at 17:12, "Timo Wilken" <guix@HIDDEN> wrote: >> What would you suggest? Simon? > > Here's a brief comparison between Simon's patches and mine -- Simon's seem to > contain fixes for a couple more things than mine currently does: > > 1. Simon sorts available versions in an error message; this can presumably be > merged independently since it doesn't conflict with other patches. > > 2. Simon always prepends a "SUBDIR/" prefix to the tag if found, whereas I try > to find the plain "vX" tag first, then fall back to "SUBDIR/vX". Judging by > https://go.dev/ref/mod#vcs-version, Simon's approach seems more correct. > I'll change my implementation to match and try it out. > > 3. For detecting the `module-path-subdirectory' in Simon's patches: that's the > same approach I used initially, but I found I have to try `(substring > module-path (string-length import-prefix))' first (to handle e.g. > cloud.google.com/go/*). This is one of the things I haven't submitted > yet... Sorry if I have missed some patches or overlooked something. Do you plan to send another patch series handling all? Cheers, simon
guix-patches@HIDDEN:bug#64036; Package guix-patches.
Full text available.Received: (at 64036) by debbugs.gnu.org; 17 Jun 2023 15:13:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 17 11:13:59 2023 Received: from localhost ([127.0.0.1]:52285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qAXck-0000F9-TZ for submit <at> debbugs.gnu.org; Sat, 17 Jun 2023 11:13:59 -0400 Received: from mx2.mythic-beasts.com ([46.235.227.24]:35093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <timo@HIDDEN>) id 1qAXcc-0000EB-Cs; Sat, 17 Jun 2023 11:13:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=twilken.net ; s=mythic-beasts-k1; h=To:From:Subject:Date; bh=pLlAjfqsoe+3U3a73MQeHAaM/uSI+UrqGsrVeSKy1QM=; b=zI4HPa8dV46Hjnio0YDducSSwZ M29u2+iSJgjnWkngcWfT9SjYDe9ZLcVAF6i1Ndo75UO/OHkpFsGhXUIm1L8Fz/B5Y6Tg3zjvoVFmy d2/oqU7XiJvDOnOICpI3cx5UJO/54X/q5T9ko6ub0/iW9+KHQrST+7gIUbsLEFePPVSChBnKxzIj0 6vl4AibdV6yP/bGdLIvjcfMXs4yCOg/+eCxfY8y0t1VVKYU/YVdRUrSzYPgPYv7nhW0qOEJZKfPL7 6rRHFmKh51WiRPEO/oUchLlUi9MFuV/F8pPh+ZAd9D/fTIovUzVWesUglqbjMlC1UubueYwa/EPQC NdDeVMug==; Received: by mailhub-hex-d.mythic-beasts.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from <timo@HIDDEN>) id 1qAXcS-004VRH-W7; Sat, 17 Jun 2023 16:13:41 +0100 Content-Type: multipart/signed; boundary=dc3bfcd0ce40fc9a1a65ded3476be064f73442d113438739c89741eeba4a; micalg=pgp-sha256; protocol="application/pgp-signature" Date: Sat, 17 Jun 2023 17:12:58 +0200 Subject: Re: bug#63631: [PATCH] import: go: Handle subpackage versioning correctly. From: "Timo Wilken" <guix@HIDDEN> To: =?utf-8?q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Message-Id: <CTF06XBYWPT0.1MV6QA1B2OB98@HIDDEN> X-Mailer: aerc 0.14.0 References: <6dd1de3dd4d968876fa55f5126056834c77b0244.1684703258.git.guix@HIDDEN> <87pm5xrbsg.fsf@HIDDEN> In-Reply-To: <87pm5xrbsg.fsf@HIDDEN> X-BlackCat-Spam-Score: 16 X-Spam-Status: No, score=1.6 X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 64036 Cc: 63631 <at> debbugs.gnu.org, 64036 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN>, 63647 <at> debbugs.gnu.org, 64035 <at> debbugs.gnu.org, 63001 <at> debbugs.gnu.org, 54097 <at> debbugs.gnu.org, wolf@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) --dc3bfcd0ce40fc9a1a65ded3476be064f73442d113438739c89741eeba4a Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Hi Ludo', (hi everyone,) On Wed Jun 14, 2023 at 11:09 PM CEST, Ludovic Court=C3=A8s wrote: > Timo Wilken <guix@HIDDEN> skribis: > > Here's a patch that fixes the reported issue (bug#54097) for me. I've o= nly > > tested this on the github.com/googleapis/google-cloud-go/compute packag= e so > > far, though it seems to work there. Perhaps others have more testcases? > > > > I don't know enough about Go tooling to use it, so I've just patched th= e Guile > > logic of the importer. (I don't write Go, I just want to package stuff = written > > in it.) In terms of performance, at least the repo contents are apparen= tly > > cached by the first `git-checkout-hash' call, even if it fails, so the = second > > call doesn't have to redownload them. I've been testing my patch further this weekend, and I have a couple more patches in the pipeline; I suppose I ought to clean those up and submit the= m. In particular, I've got fixes for the following queued up locally: 1. Finding the `module-path-subdir' needs another case for e.g. cloud.google.com/go/*. 2. My patch sometimes generates an unnecessary `go-version->git-ref' call. 3. Go versions need to be parsed from go.mod, since some packages require a newer Go compiler than our default. This I've got a patch for, but this = Go version also ought to propagate up the dependency tree. I haven't found = an easy way to do that, since the importer seems to generate top-level packages first, before descending the dep tree... 4. `fetch-module-meta-data' ought to ignore 4xx HTTP errors to follow the spec; gonum.org/v1/gonum specifically depends on this behaviour. I've been trying to recursively import github.com/matrix-org/dendrite, whic= h has a particularly large and hairy dependency tree. While I can now import = it without crashes, I can't build it from the imported package definitions yet= -- mainly because of lots of dependency cycles in the generated packages, but there may be more issues hidden beneath that. Still, I can recommend it as a test of everyone's importer patches, since it'll find a lot of edge cases in importing alone! > What you propose looks similar to part of the work Simon Tournier > submitted at <https://issues.guix.gnu.org/63647>. It seems lots of people have been working on the same problem -- in additio= n to Simon's patches, I found a patch submitted by Elbek (issues 64035 & 6403= 6; Cc'd). I also forgot about the issue I submitted months ago (63001)... > What would you suggest? Simon? Here's a brief comparison between Simon's patches and mine -- Simon's seem = to contain fixes for a couple more things than mine currently does: 1. Simon sorts available versions in an error message; this can presumably = be merged independently since it doesn't conflict with other patches. 2. Simon always prepends a "SUBDIR/" prefix to the tag if found, whereas I = try to find the plain "vX" tag first, then fall back to "SUBDIR/vX". Judging= by https://go.dev/ref/mod#vcs-version, Simon's approach seems more correct. I'll change my implementation to match and try it out. 3. For detecting the `module-path-subdirectory' in Simon's patches: that's = the same approach I used initially, but I found I have to try `(substring module-path (string-length import-prefix))' first (to handle e.g. cloud.google.com/go/*). This is one of the things I haven't submitted yet... > Thanks for the patch, Timo! Thanks for your work in sorting through all of this, Ludo'! Cheers, Timo --dc3bfcd0ce40fc9a1a65ded3476be064f73442d113438739c89741eeba4a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEU+w8BoVog92SNVvCL8eFBGgfabAFAmSNzaUACgkQL8eFBGgf abDEaA//Y6k/Uckhvq+wllES0TjACxVG+2bY2E/wLZNoQShXF5Tn3ZQ9o2HOU7Gr p8er/t/JkPLYm9w2MidUtvTms6qxp8H/YIZ12gzZ+GP/eoKa/iiqt42+KZvLS/Is B2JWEcaJLFYy0w9nuubeuQpgcWEmxyk7/zb++GovD0tfYgczII3N1Z5fhRmeAj0N FbKqfkBocxruYvBfcI5KhMV6Q1TjCwuAH+j2iwNmsiSnm7NTKbJxfCyO9+p5UF9w O/em01p9J+Cg6EEFunwoi1pjoEAkVZCRtgaiP1SMgapq74UKKagvsWqMoW+JHpDf uuiaVn1sLuTt+u9KGamYqaCj1NRcCfN7SjPxS7oTM4hsytVDmUB/eIHD6t3HntCP Ev43fJKJwLoybQV0ptajnJggEEaEY1cegQG683jsD0ycrToh4YEhLe5fQsGhaLMA 7MSLjjf0K73BoFyZi+wYyfDPYqXRQmpb3Z6cKJPlF3v4IF13UtSxP0yBRdz930aI 1b1Q5khLQzQBI0fvxMNcZGPeA2RjPyNsXE8pKn9zEkIunzX9VYN8az++EjX928Ox mmgjEUsLWMPCSMwGcEoZye6R5wJUG34LEkoQTbySf+314hlELPuGcLCatFgZZbXq 1Hn1upt13XYRYVCX/SXIpBJL9gdNbi2sSg8FVm4Aq+sQQqZzAKs= =fjJn -----END PGP SIGNATURE----- --dc3bfcd0ce40fc9a1a65ded3476be064f73442d113438739c89741eeba4a--
guix-patches@HIDDEN:bug#64036; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 13 Jun 2023 06:32:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 13 02:32:11 2023
Received: from localhost ([127.0.0.1]:41198 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q8xZb-0007qj-4E
for submit <at> debbugs.gnu.org; Tue, 13 Jun 2023 02:32:11 -0400
Received: from lists.gnu.org ([209.51.188.17]:47266)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <el@HIDDEN>) id 1q8mBh-00031k-Nq
for submit <at> debbugs.gnu.org; Mon, 12 Jun 2023 14:22:46 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <el@HIDDEN>) id 1q8mBh-0002ge-Hm
for guix-patches@HIDDEN; Mon, 12 Jun 2023 14:22:45 -0400
Received: from sender4-of-o54.zoho.com ([136.143.188.54])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <el@HIDDEN>) id 1q8mBf-00083b-5w
for guix-patches@HIDDEN; Mon, 12 Jun 2023 14:22:45 -0400
ARC-Seal: i=1; a=rsa-sha256; t=1686594036; cv=none;
d=zohomail.com; s=zohoarc;
b=FKtIbI0Ki8g6ouMbWNNj2xTN76qgZmUmWdTuBjy3iOUrDvHKiqdCGlcBcInbyfS0Br1xrXKH6NCkOl7ebGSR8cdKub0N9PtEA+qN2M11TMO8jHC57QiFd90JngY0IzYydjFohWjzS8SvrRNPTLk9GPH00JgkOrP1DmBrNru3IeM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1686594036; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To;
bh=rMpfpPKb9PZH9ChT1IhoMezZZDgwrBEXbO8L+KQI634=;
b=P/wJfql84VsePBMCcwu7q1wrmDM8Tk5EI6TY1sPn2ywW0u+EuKeAeCdUoN2Qwj5xYvQWzqRPcRG7F4Y0UsBQSCiN042LBMrwEofBv4SsW2JvQEvtn11Eg9HS2Rkpiao4C7qPon74SjtGiwxOLEy49MQlDpY4C1aUxULY/1UxmA8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=mathematica.uz;
spf=pass smtp.mailfrom=el@HIDDEN;
dmarc=pass header.from=<el@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1686594036;
s=zmail; d=mathematica.uz; i=el@HIDDEN;
h=Date:Date:From:From:To:To:Message-Id:Message-Id:In-Reply-To:Subject:Subject:MIME-Version:Content-Type:Reply-To:Cc;
bh=rMpfpPKb9PZH9ChT1IhoMezZZDgwrBEXbO8L+KQI634=;
b=Xajv/+cX2I0EIlL5nngc3CW87LSlctYvZfWsvz2aQso0Vt/0kzlMYCAAyQOAph7u
X8I8ign9MGvdwSoCt6n9MS4A8JV+7LdYSMHrC41uztXjkpk6MSG4WOVxsjyIlXO4WaM
TEeroC6HuvQjJHa5VQDDYszs9qBW9X/w+8PK0KRw=
Received: from mail.zoho.com by mx.zohomail.com
with SMTP id 1686594034363514.0822206243352;
Mon, 12 Jun 2023 11:20:34 -0700 (PDT)
Date: Mon, 12 Jun 2023 23:20:34 +0500
From: Elbek <el@HIDDEN>
To: "guix-patches" <guix-patches@HIDDEN>
Message-Id: <188b0d69a95.da3e871b642333.4245430848638815620@HIDDEN>
In-Reply-To:
Subject: [PATH] fix a bug on importing go packages.
MIME-Version: 1.0
Content-Type: multipart/mixed;
boundary="----=_Part_2002805_481489749.1686594034325"
Importance: Medium
User-Agent: Zoho Mail
X-Mailer: Zoho Mail
X-Zoho-Virus-Status: 1
Received-SPF: pass client-ip=136.143.188.54; envelope-from=el@HIDDEN;
helo=sender4-of-o54.zoho.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Tue, 13 Jun 2023 02:32:05 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
------=_Part_2002805_481489749.1686594034325
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Hello.
This patch addresses the issue https://issues.guix.gnu.org/63001
Currently "guix import go ..." looks to the repository depending on the version of a package.
For example, if package version is $1.11.0$, the importer tries to look to the repository's tag named v1.11.0,
but some packages are using tags that are prefixed by the module name.
For example, the package cloud.google.com/go/workflows use the tag workflows/v1.11.0
This patch changes go importer, such that it looks to the module-name prefixed tags if they exists, and behaves as before otherwise.
------=_Part_2002805_481489749.1686594034325
Content-Type: application/octet-stream;
name=guix-import-go--tags-may-prefixed-by-module-name.patch
Content-Transfer-Encoding: 7bit
X-ZM_AttachId: 139058868343260050
Content-Disposition: attachment;
filename=guix-import-go--tags-may-prefixed-by-module-name.patch
diff --git a/guix/import/go.scm b/guix/import/go.scm
index 0357e6a1eb..962ff4c76f 100644
--- a/guix/import/go.scm
+++ b/guix/import/go.scm
@@ -448,6 +448,13 @@ (define* (go-module->guix-package-name module-path #:optional version)
(string-append "-" version)
"")))))
+(define* (go-module->package-name module-path version)
+ "Converts a module's path to the go package name."
+ (let ((name (basename module-path)))
+ (if (string-prefix? name version)
+ (basename (dirname module-path))
+ name)))
+
(define (strip-.git-suffix/maybe repo-url)
"Strip a repository URL '.git' suffix from REPO-URL if hosted at GitHub."
(match repo-url
@@ -513,13 +520,18 @@ (define cache
`(tag-or-commit . ,reference)))))
(file-hash* checkout #:algorithm algorithm #:recursive? #true)))
-(define (vcs->origin vcs-type vcs-repo-url version)
+(define (vcs->origin vcs-type vcs-repo-url version module-name)
"Generate the `origin' block of a package depending on what type of source
control system is being used."
(case vcs-type
((git)
- (let ((plain-version? (string=? version (go-version->git-ref version)))
- (v-prefixed? (string-prefix? "v" version)))
+ (let* ((plain-version? (string=? version (go-version->git-ref version)))
+ (v-prefixed? (string-prefix? "v" version))
+ (prefixed-version (string-append module-name "/" version))
+ (refs (remote-refs vcs-repo-url))
+ (use-prefixed-version? (member
+ (string-append "refs/tags/" prefixed-version)
+ refs)))
`(origin
(method git-fetch)
(uri (git-reference
@@ -528,13 +540,26 @@ (define (vcs->origin vcs-type vcs-repo-url version)
;; which the generated quoted expression refers to, has been
;; stripped of any 'v' prefixed.
(commit ,(if (and plain-version? v-prefixed?)
- '(string-append "v" version)
- '(go-version->git-ref version)))))
+ (if use-prefixed-version?
+ `(string-append
+ ,(string-append module-name "/v")
+ version)
+ '(string-append "v" version))
+ (if use-prefixed-version?
+ `(go-version->git-ref
+ (string-append
+ ,(string-append module-name "/")
+ version))
+ '(go-version->git-ref version))))))
(file-name (git-file-name name version))
(sha256
(base32
,(bytevector->nix-base32-string
- (git-checkout-hash vcs-repo-url (go-version->git-ref version)
+ (git-checkout-hash vcs-repo-url
+ (if use-prefixed-version?
+ (go-version->git-ref
+ (string-append module-name "/" version))
+ (go-version->git-ref version))
(hash-algorithm sha256))))))))
((hg)
`(origin
@@ -605,6 +630,7 @@ (define* (go-module->guix-package module-path #:key
(go-module-version-string goproxy module-path)) ;latest
available-versions
module-path))
+ (module-name (go-module->package-name module-path version*))
(content (fetch-go.mod goproxy module-path version*))
(dependencies+versions (go.mod-requirements (parse-go.mod content)))
(dependencies (if pin-versions?
@@ -627,7 +653,7 @@ (define* (go-module->guix-package module-path #:key
(name ,guix-name)
(version ,(strip-v-prefix version*))
(source
- ,(vcs->origin vcs-type vcs-repo-url version*))
+ ,(vcs->origin vcs-type vcs-repo-url version* module-name))
(build-system go-build-system)
(arguments
'(#:import-path ,module-path
------=_Part_2002805_481489749.1686594034325--
Elbek <el@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#64036; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.