From 9013a5370582807b0b71a8a0a0d7f63f2ca614b3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Mon, 21 Apr 2025 08:13:03 +0200 Subject: import/elpa: Improve CLI documentation for archive flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/elpa.scm (elpa-url)[elpa-archives]: Move from here… (%elpa-archives): … to here. * guix/scripts/import/elpa.scm (%options): Add “list-archives”. (show-help): Adjust accordingly. Change-Id: Ib686bd9ff5eff2d4c37b8751ec1410666d568c1f Co-authored-by: jgart Signed-off-by: Liliana Marie Prikler --- guix/import/elpa.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'guix/import/elpa.scm') 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 @@ #:use-module (guix memoization) #:export (elpa->guix-package guix-package->elpa-name + %elpa-archives %elpa-updater elpa-recursive-import)) @@ -81,15 +83,16 @@ NAMES (strings)." (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." -- cgit v1.2.3