aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinglu Chen <public@yoctocell.xyz>2021-08-31 20:17:52 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-07 15:59:34 +0200
commitaf4fa7c00cae47552486c28d5559c53e058b597f (patch)
treef8bebcc6bb4e91a8fc888b5955a9e023dcb32027
parentb8b56badd3a19a898857cb9a90150536233ba0b2 (diff)
downloadguix-af4fa7c00cae47552486c28d5559c53e058b597f.tar
guix-af4fa7c00cae47552486c28d5559c53e058b597f.tar.gz
import: elpa: Support NonGNU ELPA.
* guix/import/elpa.scm (elpa-url): Add NonGNU ELPA URL. * doc/guix.texi (Invoking guix import): Document it. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi4
-rw-r--r--guix/import/elpa.scm2
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 36a0c7f5ec..679f6b4369 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11606,6 +11606,10 @@ contained in the GnuPG keyring at
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 <go.wigust@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -80,6 +81,7 @@ NAMES (strings)."
(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)))