From af4fa7c00cae47552486c28d5559c53e058b597f Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Tue, 31 Aug 2021 20:17:52 +0200 Subject: [PATCH] import: elpa: Support NonGNU ELPA. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/elpa.scm (elpa-url): Add NonGNU ELPA URL. * doc/guix.texi (Invoking guix import): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 4 ++++ guix/import/elpa.scm | 2 ++ 2 files changed, 6 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 36a0c7f5ec..679f6b4369 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11605,6 +11605,10 @@ contained in the GnuPG keyring at @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual}). +@item +@uref{https://elpa.nongnu.org/nongnu/, NonGNU}, selected by the +@code{nongnu} identifier. + @item @uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier. diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0dc5acf51..fb59acc9e3 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ (define* (elpa-url #:optional (repo 'gnu)) (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)))