Skip to content

Commit b229f66

Browse files
committed
[Docs] Mention that CIDER's now available on NonGNU ELPA
1 parent 625f91c commit b229f66

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
-----------
66
[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
7-
[![MELPA](http://melpa.org/packages/cider-badge.svg)](http://melpa.org/#/cider)
8-
[![MELPA Stable](http://stable.melpa.org/packages/cider-badge.svg)](http://stable.melpa.org/#/cider)
97
[![CircleCI](https://circleci.com/gh/clojure-emacs/cider.svg?style=svg)](https://circleci.com/gh/clojure-emacs/cider)
108
[![Spell-check Status](https://github.com/clojure-emacs/cider/actions/workflows/spell_checking.yml/badge.svg)](https://github.com/clojure-emacs/cider/actions/workflows/spell_checking.yml)
119
[![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?sanitize=true)](https://discord.com/invite/nFPpynQPME)
@@ -43,11 +41,15 @@ details.
4341

4442
### Installation
4543

44+
[![MELPA](http://melpa.org/packages/cider-badge.svg)](http://melpa.org/#/cider)
45+
[![MELPA Stable](http://stable.melpa.org/packages/cider-badge.svg)](http://stable.melpa.org/#/cider)
46+
[![NonGNU ELPA](https://elpa.nongnu.org/nongnu/projectile.svg)](https://elpa.nongnu.org/nongnu/cider.html)
47+
4648
The recommended way to install CIDER is via `package.el` - the built-in package
4749
manager in Emacs.
4850

49-
CIDER is available on the two major `package.el` community
50-
maintained repos -
51+
CIDER is available on all major `package.el` community
52+
maintained repos - [NonGNU ELPA](https://elpa.nongnu.org),
5153
[MELPA Stable](http://stable.melpa.org)
5254
and [MELPA](http://melpa.org).
5355

doc/modules/ROOT/pages/basics/installation.adoc

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ WARNING: CIDER does not support ClojureCLR.
2424

2525
== Installation via package.el
2626

27-
CIDER is available on the two major `package.el` community
27+
CIDER is available on all major `package.el` community
2828
maintained repos -
29+
https://elpa.nongnu.org[NonGNU ELPA],
2930
http://stable.melpa.org[MELPA Stable]
3031
and http://melpa.org[MELPA].
3132

33+
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.
34+
3235
You can install CIDER with the following command:
3336

3437
kbd:[M-x package-install <RET> cider <RET>]
@@ -54,27 +57,31 @@ time to time. Nevertheless, installing from MELPA is a reasonable way
5457
to obtain CIDER. The `master` branch is normally quite stable
5558
and serious regressions there are usually fixed quickly.
5659

60+
TIP: If you don't want to (or can't) wait for MELPA to rebuild CIDER,
61+
you can easily build and install an up-to-date MELPA package locally yourself. Check out
62+
http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/[this article]
63+
for details on the subject.
64+
5765
If you have concerns about living on the leading edge of CIDER
58-
deveopment, you can always pin CIDER to use MELPA Stable like this:
66+
development, you can always pin CIDER to use NonGNU ELPA or MELPA Stable like this:
5967

6068
[source,lisp]
6169
----
70+
;; pin to NonGNU ELPA
71+
(add-to-list 'package-pinned-packages '(cider . "nongnu") t)
72+
73+
;; pin to MELPA Stable
6274
(add-to-list 'package-pinned-packages '(cider . "melpa-stable") t)
6375
----
6476

65-
TIP: If you don't want to (or can't) wait for MELPA to rebuild CIDER,
66-
you can easily build and install an up-to-date MELPA package locally yourself. Check out
67-
http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/[this article]
68-
for details on the subject.
69-
7077
NOTE: CIDER has dependencies (e.g. `queue` & `seq`) that are only available in the
7178
https://elpa.gnu.org/[GNU ELPA repository]. It's the only package repository
7279
enabled by default in Emacs and you should not disable it!
7380

7481
== Installation via use-package
7582

7683
`use-package` can be used to install CIDER via the ``package.el``'s repositories
77-
http://stable.melpa.org[MELPA Stable] and http://melpa.org[MELPA].
84+
https://elpa.nongnu.org[NonGNU ELPA], http://stable.melpa.org[MELPA Stable] and http://melpa.org[MELPA].
7885

7986
If you wanted to install the version of CIDER which is what is to be found in
8087
the `master` branch, declare the following in your Emacs initialization file

0 commit comments

Comments
 (0)