branch: elpa/cider
commit b229f66429f039e2f2c19f83d3e5fd6d6f303222
Author: Bozhidar Batsov <bozhi...@batsov.dev>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
[Docs] Mention that CIDER's now available on NonGNU ELPA
---
README.md | 10 ++++++----
doc/modules/ROOT/pages/basics/installation.adoc | 23 +++++++++++++++--------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 09be2064ee..168755bdca 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
-----------
[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
-[](http://melpa.org/#/cider)
-[](http://stable.melpa.org/#/cider)
[](https://circleci.com/gh/clojure-emacs/cider)
[](https://github.com/clojure-emacs/cider/actions/workflows/spell_checking.yml)
[](https://discord.com/invite/nFPpynQPME)
@@ -43,11 +41,15 @@ details.
### Installation
+[](http://melpa.org/#/cider)
+[](http://stable.melpa.org/#/cider)
+[](https://elpa.nongnu.org/nongnu/cider.html)
+
The recommended way to install CIDER is via `package.el` - the built-in package
manager in Emacs.
-CIDER is available on the two major `package.el` community
-maintained repos -
+CIDER is available on all major `package.el` community
+maintained repos - [NonGNU ELPA](https://elpa.nongnu.org),
[MELPA Stable](http://stable.melpa.org)
and [MELPA](http://melpa.org).
diff --git a/doc/modules/ROOT/pages/basics/installation.adoc
b/doc/modules/ROOT/pages/basics/installation.adoc
index 2f7db5e154..3a124d01e2 100644
--- a/doc/modules/ROOT/pages/basics/installation.adoc
+++ b/doc/modules/ROOT/pages/basics/installation.adoc
@@ -24,11 +24,14 @@ WARNING: CIDER does not support ClojureCLR.
== Installation via package.el
-CIDER is available on the two major `package.el` community
+CIDER is available on all major `package.el` community
maintained repos -
+https://elpa.nongnu.org[NonGNU ELPA],
http://stable.melpa.org[MELPA Stable]
and http://melpa.org[MELPA].
+NOTE: NonGNU ELPA is one of Emacs's standard repositories and is enabled by
default on Emacs 28+. You'll have to setup MELPA and MELPA Stable yourselves if
you want to use them.
+
You can install CIDER with the following command:
kbd:[M-x package-install <RET> cider <RET>]
@@ -54,19 +57,23 @@ time to time. Nevertheless, installing from MELPA is a
reasonable way
to obtain CIDER. The `master` branch is normally quite stable
and serious regressions there are usually fixed quickly.
+TIP: If you don't want to (or can't) wait for MELPA to rebuild CIDER,
+you can easily build and install an up-to-date MELPA package locally yourself.
Check out
+http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/[this
article]
+for details on the subject.
+
If you have concerns about living on the leading edge of CIDER
-deveopment, you can always pin CIDER to use MELPA Stable like this:
+development, you can always pin CIDER to use NonGNU ELPA or MELPA Stable like
this:
[source,lisp]
----
+;; pin to NonGNU ELPA
+(add-to-list 'package-pinned-packages '(cider . "nongnu") t)
+
+;; pin to MELPA Stable
(add-to-list 'package-pinned-packages '(cider . "melpa-stable") t)
----
-TIP: If you don't want to (or can't) wait for MELPA to rebuild CIDER,
-you can easily build and install an up-to-date MELPA package locally yourself.
Check out
-http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/[this
article]
-for details on the subject.
-
NOTE: CIDER has dependencies (e.g. `queue` & `seq`) that are only available in
the
https://elpa.gnu.org/[GNU ELPA repository]. It's the only package repository
enabled by default in Emacs and you should not disable it!
@@ -74,7 +81,7 @@ enabled by default in Emacs and you should not disable it!
== Installation via use-package
`use-package` can be used to install CIDER via the ``package.el``'s
repositories
-http://stable.melpa.org[MELPA Stable] and http://melpa.org[MELPA].
+https://elpa.nongnu.org[NonGNU ELPA], http://stable.melpa.org[MELPA Stable]
and http://melpa.org[MELPA].
If you wanted to install the version of CIDER which is what is to be found in
the `master` branch, declare the following in your Emacs initialization file
