From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 06 06:57:21 2021 Received: (at submit) by debbugs.gnu.org; 6 Sep 2021 10:57:21 +0000 Received: from localhost ([127.0.0.1]:52109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNCJV-0005RA-8K for submit@debbugs.gnu.org; Mon, 06 Sep 2021 06:57:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:35936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNCJP-0005Qw-9Y for submit@debbugs.gnu.org; Mon, 06 Sep 2021 06:57:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNCJO-0000cs-0p for guix-patches@gnu.org; Mon, 06 Sep 2021 06:57:14 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:56132 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNCJL-0000LO-Fc for guix-patches@gnu.org; Mon, 06 Sep 2021 06:57:13 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1630925825; bh=zvtc+Usc5TcstdMdjk8Juu1HB9FJ3YduT+mo/DONu60=; h=From:To:Subject:Date; b=IDVzn10XndCt7M9m/CDpQEoI4s4muWIQDKXn8yCFYqy2HvE8SO2QtbTvHj3+CHnmp nElYD1ueeoAsUWnC5GW0mFICjW2SlCRxiodk1ubDo2bH/dOe5wVpn+4g5Hq14M/ZKA KW98aonr+kPaXG03/PF+QdI4v3XY75p5dt/hLOqs= To: guix-patches@gnu.org Subject: [PATCH] import: elpa: Don't hardcode default branch to 'master'. Message-Id: <7a5a35f29121ebbb2e1ec1fe991159fbf6bae2e4.1630925679.git.public@yoctocell.xyz> Date: Mon, 06 Sep 2021 12:57:04 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.419, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Otherwise, remotes without a branch named 'master' will cause an error when importing. * guix/import/elpa (git-repository->origin): Fallback to HEAD instead of the 'master' branch. --- For example, try to import the ‘consult’ package from MELPA: Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.5 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Otherwise, remotes without a branch named 'master' will cause an error when importing. * guix/import/elpa (git-repository->origin): Fallback to HEAD instead of the 'master' branch. --- For example, try to import the =E2=80=98consult=E2=80=99 package from MELPA: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix import elpa -a melpa consult ;;; note: source file /home/yoctocell/src/guix/guix/import/elpa.scm ;;; newer than compiled /home/yoctocell/src/guix/guix/import/elpa.go ;;; note: source file /home/yoctocell/src/guix/guix/import/elpa.scm ;;; newer than compiled /home/yoctocell/.config/guix/current/lib/guil= e/3.0/site-ccache/guix/import/elpa.go ;;; note: source file /home/yoctocell/src/guix/guix/import/elpa.scm ;;; newer than compiled /home/yoctocell/.guix-home/profile/lib/guile/= 3.0/site-ccache/guix/import/elpa.go Backtrace: In ice-9/boot-9.scm: 1752:10 16 (with-exception-handler _ _ #:unwind? _ #:unwind-for-type _) In unknown file: 15 (apply-smob/0 #) In ice-9/boot-9.scm: 724:2 14 (call-with-prompt _ _ #) In ice-9/eval.scm: 619:8 13 (_ #(#(#))) In guix/ui.scm: 2185:7 12 (run-guix . _) 2148:10 11 (run-guix-command _ . _) In guix/scripts/import.scm: 121:11 10 (guix-import . _) In guix/scripts/import/elpa.scm: 104:23 9 (guix-import-elpa . _) In guix/import/elpa.scm: 207:2 8 (elpa->guix-package _ #:repo _ #:version _) In ice-9/boot-9.scm: 1752:10 7 (with-exception-handler _ _ #:unwind? _ #:unwind-for-type _) In guix/store.scm: 658:37 6 (thunk) In guix/git.scm: 481:8 5 (latest-repository-commit # "https://github.com/=E2=80=A6" =E2=80=A6) 247:4 4 (update-cached-checkout _ #:ref _ #:recursive? _ #:check-out? = _ #:starting-commit _ # _ =E2=80=A6) 211:19 3 (resolve _) In git/branch.scm: 101:8 2 (_ _ _ _) In git/bindings.scm: 77:2 1 (raise-git-error _) In ice-9/boot-9.scm: 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: Git error: cannot locate remote-tracking branch 'origin/master' --8<---------------cut here---------------end--------------->8--- guix/import/elpa.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0dc5acf51..f9689aaa13 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2018 Oleg Pykhalov ;;; Copyright =C2=A9 2020 Martin Becze ;;; Copyright =C2=A9 2020 Ricardo Wurmus +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -257,7 +258,7 @@ RECIPE." ((assoc-ref recipe #:commit) =3D> (lambda (commit) (cons 'commit commit))) (else - '(branch . "master")))) + '()))) =20 (let-values (((directory commit) (download-git-repository url ref))) `(origin base-commit: 9540323458de87b0b8aa421e449a4fe27af7c393 --=20 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 10 11:27:38 2021 Received: (at 50426-done) by debbugs.gnu.org; 10 Sep 2021 15:27:38 +0000 Received: from localhost ([127.0.0.1]:38977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOiRG-00047W-AL for submit@debbugs.gnu.org; Fri, 10 Sep 2021 11:27:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOiRE-00047J-U3 for 50426-done@debbugs.gnu.org; Fri, 10 Sep 2021 11:27:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49038) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOiR8-0001VS-KL; Fri, 10 Sep 2021 11:27:30 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=47226 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOiR8-0007p1-BN; Fri, 10 Sep 2021 11:27:30 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Xinglu Chen Subject: Re: bug#50426: [PATCH] import: elpa: Don't hardcode default branch to 'master'. References: <7a5a35f29121ebbb2e1ec1fe991159fbf6bae2e4.1630925679.git.public@yoctocell.xyz> Date: Fri, 10 Sep 2021 17:27:28 +0200 In-Reply-To: <7a5a35f29121ebbb2e1ec1fe991159fbf6bae2e4.1630925679.git.public@yoctocell.xyz> (Xinglu Chen's message of "Mon, 06 Sep 2021 12:57:04 +0200") Message-ID: <87bl50cuxr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 50426-done Cc: 50426-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi, Xinglu Chen skribis: > Otherwise, remotes without a branch named 'master' will cause an error wh= en > importing. > > * guix/import/elpa (git-repository->origin): Fallback to HEAD instead of = the > 'master' branch. Applied, thanks! > For example, try to import the =E2=80=98consult=E2=80=99 package from MEL= PA: > > $ ./pre-inst-env guix import elpa -a melpa consult This example works for me: --8<---------------cut here---------------start------------->8--- $ guix describe Generacio 189 Aug 30 2021 12:09:27 (nuna) guix f91ae94 repository URL: https://git.savannah.gnu.org/git/guix.git branch: master commit: f91ae9425bb385b60396a544afe27933896b8fa3 ludo@ribbon ~/src/guix$ guix import elpa -a melpa consult Starting download of /tmp/guix-file.E3Bp9a >From https://melpa.org/packages/consult-20210905.1657.tar... =E2=80=A60905.1657.tar 240KiB 501KiB/s 00:00 [#############= #####] 100.0% (package (name "emacs-consult") (version "20210905.1657") (source (origin (method url-fetch) (uri (string-append "https://melpa.org/packages/consult-" version ".tar")) (sha256 (base32 "0d29fd0r6bsn3ivqzjdlj7yhafbs84x3p4v7885nc14fgmbl5a7k")))) [=E2=80=A6] --8<---------------cut here---------------end--------------->8--- But maybe something changed on MELPA in the meantime? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 10 13:56:40 2021 Received: (at 50426-done) by debbugs.gnu.org; 10 Sep 2021 17:56:40 +0000 Received: from localhost ([127.0.0.1]:39183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOklT-0008GS-T2 for submit@debbugs.gnu.org; Fri, 10 Sep 2021 13:56:40 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:39266 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOklR-0008GC-C6 for 50426-done@debbugs.gnu.org; Fri, 10 Sep 2021 13:56:37 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1631296588; bh=GlZK3US/9yZIIByCxmNs9caBRrnDIEZvhap94LOLcfs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=GMIepFDpACrBTmCAyzFgSqXg47beQ8DCIMrhjItQ6IxdCNxz0cJh20ha1eblMucRe yvVpOETHHICPCg8qFCw47ElmOIGcpU6f3gL2sy5UwCI5+K/DZr/dPGl+8bWCf5cH1L xVaq368lPr+qKmfyj21/46Bv3i1xR7uB8ehRYB2s= To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#50426: [PATCH] import: elpa: Don't hardcode default branch to 'master'. In-Reply-To: <87bl50cuxr.fsf@gnu.org> References: <7a5a35f29121ebbb2e1ec1fe991159fbf6bae2e4.1630925679.git.public@yoctocell.xyz> <87bl50cuxr.fsf@gnu.org> Date: Fri, 10 Sep 2021 19:56:27 +0200 Message-ID: <87czpgxqk4.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Fri, Sep 10 2021, Ludovic Courtès wrote: > Hi, > > Xinglu Chen skribis: > >> Otherwise, remotes without a branch named 'master' will cause an error when >> importing. >> >> * guix/import/elpa (git-repository->origin): [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps X-Debbugs-Envelope-To: 50426-done Cc: 50426-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Fri, Sep 10 2021, Ludovic Courtès wrote: > Hi, > > Xinglu Chen skribis: > >> Otherwise, remotes without a branch named 'master' will cause an error when >> importing. >> >> * guix/import/elpa (git-repository->origin): [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Fri, Sep 10 2021, Ludovic Court=C3=A8s wrote: > Hi, > > Xinglu Chen skribis: > >> Otherwise, remotes without a branch named 'master' will cause an error w= hen >> importing. >> >> * guix/import/elpa (git-repository->origin): Fallback to HEAD instead of= the >> 'master' branch. > > Applied, thanks! > >> For example, try to import the =E2=80=98consult=E2=80=99 package from ME= LPA: >> >> $ ./pre-inst-env guix import elpa -a melpa consult > > This example works for me: > > --8<---------------cut here---------------start------------->8--- > $ guix describe > Generacio 189 Aug 30 2021 12:09:27 (nuna) > guix f91ae94 > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: master > commit: f91ae9425bb385b60396a544afe27933896b8fa3 > ludo@ribbon ~/src/guix$ guix import elpa -a melpa consult > > Starting download of /tmp/guix-file.E3Bp9a > From https://melpa.org/packages/consult-20210905.1657.tar... > =E2=80=A60905.1657.tar 240KiB 501KiB/s 00:00 [###########= #######] 100.0% > (package > (name "emacs-consult") > (version "20210905.1657") > (source > (origin > (method url-fetch) > (uri (string-append > "https://melpa.org/packages/consult-" > version > ".tar")) > (sha256 > (base32 > "0d29fd0r6bsn3ivqzjdlj7yhafbs84x3p4v7885nc14fgmbl5a7k")))) > [=E2=80=A6] > --8<---------------cut here---------------end--------------->8--- > > But maybe something changed on MELPA in the meantime? Ah, I think you are running into #49006[1], which uses the MELPA URL instead of the Git repo. [1]: --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmE7nEsVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5ESAQALG5SzCiS4KaxN2bUgfnEIC8K+9w CnSdGJ6G7/2qtuP+dJLjtbNYyJsqfJNxZssnK8bxUydNZuBlfLwP2zPZp7dM/0SQ 0H1Ni4+e0WXkASSEk9gVtUq4uKFiSGbJk3x+3/RtKutD8HZ5GcCtr37IQKBc9xaJ bIl5dMgxoZLu/UJBY8E2XbMtFcCUqhLCbUqWQ7nFBYxyRYWEGI3RR2NZPk4sSxmv 1yuKuTDFU/rL0zmtzbfUF5Zx/5I8A6Jj5ev712KnUie9NSy6kDOHsVkrBXr524qk AEXW6PnZ4HI3mOmTZWd/MkGtX8szfoY3TXrae93AJy0rnmoMVcxYn/X8pVCUTB6i NGuAdYI9eAGkyyPIt3/0bQ4Rs0o0OQ0+E9MbyPpXv5SNRLvzANunChq6HQiAz11Z HXWEWlKSRj7z4z4/E6Mrzej4x4l6WJ+zlqqs98+/IKcurT/IYDk6Fkv6JkQ9vra1 i6dWeyHnC3Vf62jK5tNCMzlYN5uXNAJUaggSa6jvGnoiIgIqowaAoFwp7XVv0tGb 10Lj9ytdrBgsfA9kbySTr1q18TKNwhlpwSD9dRPsvDZornVyExQYdWob14Ij5f0p hMnup8zRAFmw8+QuxluMTNNKbPVxzNyZ9ZskPzr3HroImtm7GMeHDFdps2b8MM9q XH6Oe50zezbHWbYt =KeQV -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jul 27 08:51:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 09 Oct 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator