From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 16 12:58:32 2025 Received: (at submit) by debbugs.gnu.org; 16 Apr 2025 16:58:33 +0000 Received: from localhost ([127.0.0.1]:41173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u565h-0006HB-42 for submit@debbugs.gnu.org; Wed, 16 Apr 2025 12:58:31 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55562) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u563z-00067O-Cc for submit@debbugs.gnu.org; Wed, 16 Apr 2025 12:56:44 -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 ) id 1u563o-00058g-0G for guix-patches@gnu.org; Wed, 16 Apr 2025 12:56:28 -0400 Received: from mx2.dismail.de ([159.69.191.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u563h-0002Rt-3e for guix-patches@gnu.org; Wed, 16 Apr 2025 12:56:24 -0400 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 6b665a43 for ; Wed, 16 Apr 2025 18:56:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=6nRYJqQYXCIs3UNwrMwXK CKVLahLPGaAzu0XQ25P7bE=; b=SSKLkSmrhvWgtRRgmhrZUS66G/pWnvfUn8bIV rNaJvFoYszCR5OfLaFDa6ri1vGn14R9BrZ84I8g3l5FafKrQOHT7TztrnaxkhlLE JhNZ+B7/hp+hIssC7cDCkpB82qvn4rT2HWJY3Z4SwApHEeyOVL2iFeY9nKPHJbcj /12FtbN0OovKJuph9bOgm3gxr9Is6yKGduCgraW4D+Bfhc5ClfXKZrhqUhHfw+7e gn7hHIQOSjDoZzV8Kt+K1EqGLZdlpjdTEnc6Jm2JnP0i098OwTpZOGqju5WeYU+S uJO3haZXn8pSLl421hzMTe5eajg09W3WBjTp12YMpDOayrxdw== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 64c9aa01 for ; Wed, 16 Apr 2025 18:56:18 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id d20d7a3c for ; Wed, 16 Apr 2025 18:56:18 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 3ff3f87f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 16 Apr 2025 18:56:17 +0200 (CEST) From: jgart To: guix-patches@gnu.org Subject: [PATCH v2] import/elpa: Improve CLI documentation for archive flag. Date: Wed, 16 Apr 2025 11:56:01 -0500 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Cayetano Santos , Christopher Baines , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=159.69.191.136; envelope-from=jgart@dismail.de; helo=mx2.dismail.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: jgart 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.1 (/) * guix/import/elpa.scm (%elpa-archives): Add new global variable listing the elpa archives. * guix/scripts/import/elpa.scm: Use %elpa-archives in CLI documentation and reference it from the archives list in the default options global variable. Change-Id: Ib686bd9ff5eff2d4c37b8751ec1410666d568c1f --- guix/import/elpa.scm | 17 ++++++++++------- guix/scripts/import/elpa.scm | 10 +++++++--- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index ea16885d90..eda3d6d60b 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2025 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ (define-module (guix import elpa) #:use-module (guix memoization) #:export (elpa->guix-package guix-package->elpa-name + %elpa-archives %elpa-updater elpa-recursive-import)) @@ -81,15 +83,16 @@ (define (elpa-name->package-name name) (string-downcase name) (string-append package-name-prefix (string-downcase name))))) +(define %elpa-archives + '((gnu . "https://elpa.gnu.org/packages") + (gnu/http . "http://elpa.gnu.org/packages") ;for testing + (nongnu . "https://elpa.nongnu.org/nongnu") + (melpa-stable . "https://stable.melpa.org/packages") + (melpa . "https://melpa.org/packages"))) + (define* (elpa-url #:optional (repo 'gnu)) "Retrieve the URL of REPO." - (let ((elpa-archives - '((gnu . "https://elpa.gnu.org/packages") - (gnu/http . "http://elpa.gnu.org/packages") ;for testing - (nongnu . "https://elpa.nongnu.org/nongnu") - (melpa-stable . "https://stable.melpa.org/packages") - (melpa . "https://melpa.org/packages")))) - (assq-ref elpa-archives repo))) + (assq-ref %elpa-archives repo)) (define* (elpa-fetch-archive #:optional (repo 'gnu)) "Retrieve the archive with the list of packages available from REPO." diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index 7f77beaac0..cf80a59ec1 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2025 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,13 +41,16 @@ (define-module (guix scripts import elpa) ;;; (define %default-options - '((repo . gnu))) + `((repo . ,(first (assoc 'gnu %elpa-archives))))) (define (show-help) (display (G_ "Usage: guix import elpa PACKAGE-NAME Import the latest package named PACKAGE-NAME from an ELPA repository.\n")) - (display (G_ " - -a, --archive=ARCHIVE specify the archive repository")) + (display + (format #f + (G_ " + -a, --archive=ARCHIVE archive repository must be one of ~{~a ~}") + (map first %elpa-archives))) (display (G_ " -h, --help display this help and exit")) (display (G_ " base-commit: c2af5487988b57ba80edb45f75a39152f8c49745 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 21 11:03:46 2025 Received: (at 77845) by debbugs.gnu.org; 21 Apr 2025 15:03:46 +0000 Received: from localhost ([127.0.0.1]:36516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6sgU-0006Ny-1A for submit@debbugs.gnu.org; Mon, 21 Apr 2025 11:03:46 -0400 Received: from mx1.dismail.de ([78.46.223.134]:5216) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6sgO-0006NW-Vq for 77845@debbugs.gnu.org; Mon, 21 Apr 2025 11:03:43 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 74409fdc; Mon, 21 Apr 2025 17:03:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:from:message-id:subject:to:cc :in-reply-to:references; s=20190914; bh=vQqmib3tV+4q/9BQlmLxTR9E pBm/DZAY2Lq2M6odaDo=; b=u44049FmIoX1PNkEBeaQx7b3ksApnStHCwKF/OZH C7Er+lKljrhMlwHmXNy07ex0havJxQMJvuX7AaUM4V7tca1YTxenTNG5l2/5X6S+ V2QV5QnYIQMud+8VJcq//jv+wD/ajz/DUt75ssU0IJU9s78mkMS4qKAuAdiEApGO Hpeeok93TXaZyQWIIl/4Kx8i+a90pDAEoMoX150PTUknkZ+amxWbRzBuqJOnSYD8 lOYoxZ5pYl/Nowy+7SC84SDiaZkPj9Lnz2ujam4O+nbtVFhR5x2gdFcRpiumWEZs EU8lSdYsR09FmaxeYsGffdnbP8vGTT4T2OH1Ou+p7oCp2g== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 1c1fdb62; Mon, 21 Apr 2025 17:03:32 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id ff453316; Mon, 21 Apr 2025 17:03:32 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 56c74052 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 21 Apr 2025 17:03:32 +0200 (CEST) MIME-Version: 1.0 Date: Mon, 21 Apr 2025 15:03:31 +0000 Content-Type: multipart/alternative; boundary="95a14f98-23b9-4c68-9b59-0484c0482180-1" From: "jgart" Message-ID: TLS-Required: No Subject: Re: [PATCH v3] import/elpa: Improve CLI documentation for archive flag. To: "Liliana Marie Prikler" , 77845@debbugs.gnu.org In-Reply-To: <89befc166ef85d85576ef10a8e1eba7f040e3c83.1745216219.git.liliana.prikler@gmail.com> References: <89befc166ef85d85576ef10a8e1eba7f040e3c83.1745216219.git.liliana.prikler@gmail.com> X-Spam-Score: 2.3 (++) 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: Hi Liliana, Thanks for the improvements! Feel free to merge it, LGTM. Content analysis details: (2.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in bl.score.senderscore.com] 0.0 HTML_MESSAGE BODY: HTML included in message -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] X-Debbugs-Envelope-To: 77845 Cc: Josselin Poiret , Tobias Geerinckx-Rice , Ian Eure , Mathieu Othacehe , =?utf-8?B?THVkb3ZpYyBDb3VydMOocw==?= , Simon Tournier , Cayetano Santos , Andrew Tropin , Hilton Chain , Divya Ranjan Pattanaik 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 (+) 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: Hi Liliana, Thanks for the improvements! Feel free to merge it, LGTM. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in sa-trusted.bondedsender.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in bl.score.senderscore.com] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HTML_MESSAGE BODY: HTML included in message -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --95a14f98-23b9-4c68-9b59-0484c0482180-1 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Liliana, Thanks for the improvements! Feel free to merge it, LGTM. all best, jgart --95a14f98-23b9-4c68-9b59-0484c0482180-1 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Liliana,

Thanks for the= improvements!

Feel free to merge it, LGTM.

all best,
jgart

--95a14f98-23b9-4c68-9b59-0484c0482180-1-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 20 11:16:42 2025 Received: (at 77845) by debbugs.gnu.org; 20 May 2025 15:16:42 +0000 Received: from localhost ([127.0.0.1]:32903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHOht-0007Le-Ci for submit@debbugs.gnu.org; Tue, 20 May 2025 11:16:41 -0400 Received: from mx1.dismail.de ([78.46.223.134]:30952) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHOhq-0007KY-Kk for 77845@debbugs.gnu.org; Tue, 20 May 2025 11:16:39 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 692fb225; Tue, 20 May 2025 17:16:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:from:message-id:subject:to:cc :in-reply-to:references; s=20190914; bh=ALHFg2xIfeeGVePY6ZwI1lmt k09kiGalXrE6ap98he4=; b=WXqtuhXua6HLPnk8Tg6JdyKPEsR5JytKy61bhbn9 fQz20QVflNE620dEECK5hfoqv5hK/GVRC1YJNhqffiF140LubPsJJvkr9RdI2bal PskH3SY1nBUNgDWUEY4Ccdt0Ys7guS+0BUTKHGzwQepYJ28ysT+JvGkfVkGI/HSW z7EecbjcGfXuNiMgpDTVAdk3Z1C1wrPYyQI3eNJuPxhiwCtv1XN3dDWYdaK12iqd JJ4qMnyzYxFEz+9gk66tSAcv9iadumO9dMtXIx0pxj37cUC8kbPugYftYmLI1htY XI/MeSEGDwAjgNlUV5QxpE5iwoeKv9R719VPtOGBFO2h5w== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0184f34f; Tue, 20 May 2025 17:16:30 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id c699a44f; Tue, 20 May 2025 17:16:30 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 273d7f31 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 20 May 2025 17:16:29 +0200 (CEST) MIME-Version: 1.0 Date: Tue, 20 May 2025 15:16:29 +0000 Content-Type: multipart/alternative; boundary="8630b84e-9f2b-4992-9362-5b0a100be4dc-1" From: "jgart" Message-ID: TLS-Required: No Subject: Re: [PATCH v3] import/elpa: Improve CLI documentation for archive flag. To: "Liliana Marie Prikler" , 77845@debbugs.gnu.org In-Reply-To: <89befc166ef85d85576ef10a8e1eba7f040e3c83.1745216219.git.liliana.prikler@gmail.com> References: <89befc166ef85d85576ef10a8e1eba7f040e3c83.1745216219.git.liliana.prikler@gmail.com> X-Spam-Score: 2.3 (++) 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: Hi Liliana, What's the status on merging v3 with your changes? all best, Content analysis details: (2.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in bl.score.senderscore.com] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HTML_MESSAGE BODY: HTML included in message 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in sa-accredit.habeas.com] X-Debbugs-Envelope-To: 77845 Cc: Josselin Poiret , Tobias Geerinckx-Rice , Ian Eure , Mathieu Othacehe , =?utf-8?B?THVkb3ZpYyBDb3VydMOocw==?= , Simon Tournier , Cayetano Santos , Andrew Tropin , Hilton Chain , Divya Ranjan Pattanaik 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 (+) 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: Hi Liliana, What's the status on merging v3 with your changes? all best, Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in sa-accredit.habeas.com] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [78.46.223.134 listed in bl.score.senderscore.com] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HTML_MESSAGE BODY: HTML included in message -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --8630b84e-9f2b-4992-9362-5b0a100be4dc-1 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Liliana, What's the status on merging v3 with your changes? all best, jgart --8630b84e-9f2b-4992-9362-5b0a100be4dc-1 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
Hi Liliana,


What's the status on merging v3 with your changes?

<= /div>

all best,


jgart

--8630b84e-9f2b-4992-9362-5b0a100be4dc-1--