[bug#31133] Adding emacs-lispyville

[bug#31133] Adding emacs-lispyville

[Clément Lassieur]

Hi,

These patches aim to add emacs-lispyville, which requires an up-to-date
emacs-lispy.

I would also like to update emacs-evil to a recent Git commit, because
the last release is quite old (October 2nd) and the master branch seems
pretty stable.  We would then get the new 'evil-define-key*' (adding
'nil' support), which is needed in recent emacs-lispyville.  I just
didn't dare do the patch, imagining the tons of comments saying that
it's preferable to stick to releases :-).

Thanks,
Clément

[bug#31133] [PATCH 1/3] gnu: Add emacs-zoutline.

[Clément Lassieur]

* gnu/packages/emacs.scm (emacs-zoutline): New variable.
---
 gnu/packages/emacs.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index cb722844c..a4777ad75 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -3486,6 +3486,27 @@ lines that match the current text being edited.  This gives you the effect of
 a temporary @code{keep-lines} or @code{occur}.")
     (license license:gpl3+)))
 
+(define-public emacs-zoutline
+  (let ((commit "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699")
+        (revision "0"))
+    (package
+      (name "emacs-zoutline")
+      (version (git-version "0.1" revision commit))
+      (home-page "https://github.com/abo-abo/zoutline")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)))
+                (sha256
+                 (base32
+                  "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (synopsis "Simple outline library")
+      (description
+       "This library provides helpers for outlines.  Outlines allow to
+navigate code in a tree-like fashion.")
+      (license license:gpl3+))))
+
 (define-public emacs-lispy
   (package
     (name "emacs-lispy")
-- 
2.17.0

[bug#31133] [PATCH 2/3] gnu: emacs-lispy: Change source to recent Git commit.

[Clément Lassieur]

Release 0.26.0 was almost 3 years ago, and there have been ~772 commits since.

* gnu/packages/emacs.scm (emacs-lispy): Wrap with let, and change source to
the Git repository.
[propagated-inputs]: Add emacs-zoutline.
---
 gnu/packages/emacs.scm | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a4777ad75..9f92daa3f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3508,34 +3508,35 @@ navigate code in a tree-like fashion.")
       (license license:gpl3+))))
 
 (define-public emacs-lispy
-  (package
-    (name "emacs-lispy")
-    (version "0.26.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/abo-abo/lispy/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "15gig95cvamw5zlw99cxggd27c18b9scznjj97gvjn2zbljcaqzl"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-ace-window" ,emacs-ace-window)
-       ("emacs-iedit" ,emacs-iedit)
-       ("emacs-ivy" ,emacs-ivy)
-       ("emacs-hydra" ,emacs-hydra)))
-    (home-page "https://github.com/abo-abo/lispy")
-    (synopsis "Modal S-expression editing")
-    (description
-     "Due to the structure of Lisp syntax it's very rare for the programmer to
-want to insert characters right before \"(\" or right after \")\".  Thus
+  (let ((commit "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4")
+        (revision "0"))
+    (package
+      (name "emacs-lispy")
+      (version (git-version "0.26.0" revision commit))
+      (home-page "https://github.com/abo-abo/lispy")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)))
+                (sha256
+                 (base32
+                  "0qg85gz5akayvhb5fmn1qx7s9847gry4g20xcnq8llr839lq28dl"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-ace-window" ,emacs-ace-window)
+         ("emacs-iedit" ,emacs-iedit)
+         ("emacs-ivy" ,emacs-ivy)
+         ("emacs-hydra" ,emacs-hydra)
+         ("emacs-zoutline" ,emacs-zoutline)))
+      (synopsis "Modal S-expression editing")
+      (description
+       "Due to the structure of Lisp syntax it's very rare for the programmer
+to want to insert characters right before \"(\" or right after \")\".  Thus
 unprefixed printable characters can be used to call commands when the point is
 at one of these special locations.  Lispy provides unprefixed keybindings for
 S-expression editing when point is at the beginning or end of an
 S-expression.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-clojure-mode
   (package
-- 
2.17.0

[bug#31133] [PATCH 2/3] gnu: emacs-lispy: Change source to recent Git commit.

[Ludovic Courtès]

Clément Lassieur <clement@lassieur.org> skribis:

> Release 0.26.0 was almost 3 years ago, and there have been ~772 commits since.
>
> * gnu/packages/emacs.scm (emacs-lispy): Wrap with let, and change source to
> the Git repository.
> [propagated-inputs]: Add emacs-zoutline.

Could you move the sentence above as a comment here:

> +  (let ((commit "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4")
> +        (revision "0"))
> +    (package
> +      (name "emacs-lispy")
> +      (version (git-version "0.26.0" revision commit))

?

Otherwise LGTM, thanks!

Ludo’.

[bug#31133] [PATCH 3/3] gnu: Add emacs-lispyville.

[Clément Lassieur]

* gnu/packages/emacs.scm (emacs-lispyville): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9f92daa3f..9fe0631be 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3538,6 +3538,35 @@ S-expression editing when point is at the beginning or end of an
 S-expression.")
       (license license:gpl3+))))
 
+(define-public emacs-lispyville
+  ;; Later versions need a more recent Evil, with an evil-define-key*
+  ;; supporting nil for the state.
+  (let ((commit "b4291857ed6a49a67c4ea77522889ce51fb171ab")
+        (revision "0"))
+    (package
+      (name "emacs-lispyville")
+      (version (git-version "0.1" revision commit))
+      (home-page "https://github.com/noctuid/lispyville")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)))
+                (sha256
+                 (base32
+                  "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3"))
+                (file-name (git-file-name name version))))
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)
+         ("emacs-lispy" ,emacs-lispy)))
+      (build-system emacs-build-system)
+      (synopsis "Minor mode for integrating Evil with lispy")
+      (description
+       "LispyVille's main purpose is to provide a Lisp editing environment
+suited towards Evil users.  It can serve as a minimal layer on top of lispy
+for better integration with Evil, but it does not require the use of lispy’s
+keybinding style.  The provided commands allow for editing Lisp in normal
+state and will work even without lispy being enabled.")
+      (license license:gpl3+))))
+
 (define-public emacs-clojure-mode
   (package
     (name "emacs-clojure-mode")
-- 
2.17.0

[bug#31133] [PATCH 3/3] gnu: Add emacs-lispyville.

[Ludovic Courtès]

Clément Lassieur <clement@lassieur.org> skribis:

> * gnu/packages/emacs.scm (emacs-lispyville): New variable.

Alright, thank you!

Ludo’.

bug#31133: [PATCH 3/3] gnu: Add emacs-lispyville.

[Clément Lassieur]

Ludovic Courtès <ludo@gnu.org> writes:

> Clément Lassieur <clement@lassieur.org> skribis:
>
>> * gnu/packages/emacs.scm (emacs-lispyville): New variable.
>
> Alright, thank you!
>
> Ludo’.

Pushed, with the changes you suggested.  Thank you for the review!

Clément

[bug#31133] [PATCH 1/3] gnu: Add emacs-zoutline.

[Ludovic Courtès]

Hello,

Clément Lassieur <clement@lassieur.org> skribis:

> * gnu/packages/emacs.scm (emacs-zoutline): New variable.

[...]

> +       "This library provides helpers for outlines.  Outlines allow to
                                                                     ^^^
“allow users to”

Otherwise LGTM, thanks!

Ludo’.