master 8d5a6c9 2/2: * lisp/emacs-lisp/package.el (package-archives): Add NonGNU ELPA

[Stefan Monnier]

branch: master
commit 8d5a6c9ef5272b2a98c2faa0a9308ab69f011570
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * lisp/emacs-lisp/package.el (package-archives): Add NonGNU ELPA
---
 etc/NEWS                   | 2 ++
 lisp/emacs-lisp/package.el | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/etc/NEWS b/etc/NEWS
index 4f072df..328c666 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -85,6 +85,8 @@ useful on systems such as FreeBSD which ships only with 
"etc/termcap".
 
 * Changes in Emacs 28.1
 
+** The new NonGNU ELPA archive is enabled by default alongside GNU ELPA
+
 ** Minibuffer scrolling is now conservative by default.
 This is controlled by the new variable 'scroll-minibuffer-conservatively'.
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index bc450b0..8f77f66 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -203,6 +203,9 @@ If VERSION is nil, the package is not made available (it is 
\"disabled\")."
 
 (defcustom package-archives `(("gnu" .
                                ,(format "http%s://elpa.gnu.org/packages/"
+                                        (if (gnutls-available-p) "s" "")))
+                              ("nongnu" .
+                               ,(format "http%s://elpa.nongnu.org/nongnu/"
                                         (if (gnutls-available-p) "s" ""))))
   "An alist of archives from which to fetch.
 The default value points to the GNU Emacs package repository.