[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Jai Vetrivelan]

[-- Attachment #1.1: Type: text/plain, Size: 44 bytes --]


This patch adds the xah-fly-keys package.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-emacs-xah-fly-keys.patch --]
[-- Type: text/patch, Size: 1863 bytes --]

From ef13bc5df0030ada79826d77fda32a58cb03a025 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sat, 12 Mar 2022 17:01:43 +0530
Subject: [PATCH] gnu: Add emacs-xah-fly-keys.

* gnu/packages/emacs-xyz.scm (emacs-xah-fly-keys): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 826c2141a9..98b04d3d34 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14078,6 +14078,29 @@ (define-public emacs-xmlgen
 conversion for Emacs Lisp.")
     (license license:gpl2+)))
 
+(define-public emacs-xah-fly-keys
+  (let ((commit "fc0d82958eb484b630e5b87adff6b670e1697f20"))
+    (package
+    (name "emacs-xah-fly-keys")
+    (version "16.14.20220304152948")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/xahlee/xah-fly-keys")
+                   (commit commit)))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "18sf3k6al00n1m36b67yzswfpj5gf14zipw5waxw0vsa10f48wm7"))))
+    (build-system emacs-build-system)
+    (home-page "http://xahlee.info/emacs/misc/ergoemacs_vi_mode.html")
+    (synopsis "Modal keybinding system for emacs, based on command frequency and
+ergonomics.")
+    (description "xah-fly-keys.el is a modal editing mode for emacs, like vi,
+but the design of key/command choice is based on command frequency statistics
+and ease-of-key score. Most frequently used commands have most easy keys.")
+    (license license:gpl2))))
+
 (define-public emacs-cdlatex
   (package
     (name "emacs-cdlatex")

base-commit: 662f1f7bbac54d5762a06862b6174977003f46b9
-- 
2.34.0


[-- Attachment #1.3: Type: text/plain, Size: 309 bytes --]


There's no COPYING or LICENSE file in the repository, and the emacs-lisp
file states:

┌────
│ ;; License: GPL v2. Tell your friends to buy a copy.
└────

Please let me know if this package is considered free software to be
included in Guix. Thank you.

-- 
Jai Vetrivelan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 927 bytes --]

Jai Vetrivelan schreef op za 12-03-2022 om 17:53 [+0530]:
> There's no COPYING or LICENSE file in the repository, and the emacs-
> lisp
> file states:
> 
> ┌────
> │ ;; License: GPL v2. Tell your friends to buy a copy.
> └────
> 
> Please let me know if this package is considered free software to be
> included in Guix. Thank you.

Emacs is GPL3+ (according to guix show).  This extension of Emacs is
GPL2-only (according to the package definition).  Seems like the author
intended it to be free software, but accidentally made a license
incompatibility?  

Additionally, IIRC, the GPL has some requirements about including a
copy of the GPL.

I assume these issue would be easy to correct by contacting upstream.

I looked a little further and saw
<https://github.com/xahlee/xah-fly-keys/issues/28>, so I guess that the
.el is just a little out-of-date.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Jai Vetrivelan]

[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]

Hello Maxime,

On 2022-03-12, 18:59 +0100, Maxime Devos <maximedevos@telenet.be> wrote:

> Emacs is GPL3+ (according to guix show).  This extension of Emacs is
> GPL2-only (according to the package definition). Seems like the author
> intended it to be free software, but accidentally made a license
> incompatibility?

Is there any requirement for third party elisp packages to be /gpl3-or-later/?
<https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01069.html>
talks only about packages in the ELPA (xah-fly-keys is not a part of any
ELPA). One package in emacs-xyz.scm is /gpl2-only/, which upstream has
updated to /gpl3+/. [1]

My original concern was the second sentence of the license string.

> Additionally, IIRC, the GPL has some requirements about including a
> copy of the GPL.
>
> I assume these issue would be easy to correct by contacting upstream.
>
> I looked a little further and saw
> <https://github.com/xahlee/xah-fly-keys/issues/28>, so I guess that
> the .el is just a little out-of-date.

I have contacted the author off-list regarding clarification on license.

[1] https://github.com/rlister/org-present/pull/39

-- 
Jai Vetrivelan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Jai Vetrivelan schreef op zo 13-03-2022 om 08:33 [+0530]:
> I have contacted the author off-list regarding clarification on
> license.
> 
> [1] https://github.com/rlister/org-present/pull/39

That's for org-present, not emacs-xah-fly-keys.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

Jai Vetrivelan schreef op zo 13-03-2022 om 08:33 [+0530]:
Is there any requirement for third party elisp packages to be /gpl3-
or-later/?
<https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01069.html>

GPL-3-only should also be fine I think (at least, as long as the Emacs
in Guix isn't updated to a new Emacs that is GPL4+)).  I guess that
gpl2+ is also fine in Guix (at least for ‘old’ emacs packages that were
written with ‘old’ GPL2+ Emacen in mind, perhaps also for other
packages but I don't know the legalities of that at all) though I
recommend the authors of these packages to update anyway (just in case,
and because of <https://www.gnu.org/licenses/rms-why-gplv3.html>).

Greetings,
Maxime.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Jai Vetrivelan]

[-- Attachment #1.1: Type: text/plain, Size: 1548 bytes --]


The license of xah-fly-keys has been updated to gpl3 with commit
6e974bd21f2d42aaa6d0b331a162cb554085b72e. I think the patch can now be
applied with commit pointing to current HEAD.

On 2022-03-13, 10:08 +0100, Maxime Devos <maximedevos@telenet.be> wrote:

> Jai Vetrivelan schreef op zo 13-03-2022 om 08:33 [+0530]:
>> I have contacted the author off-list regarding clarification on
>> license.
>> 
>> [1] https://github.com/rlister/org-present/pull/39
>
> That's for org-present, not emacs-xah-fly-keys.

I terribly bad at footnotes, that link was meant for

“One package in emacs-xyz.scm is /gpl2-only/, which upstream has
updated to /gpl3+/. [1]”

On 2022-03-13, 10:20 +0100, Maxime Devos <maximedevos@telenet.be> wrote:

> Jai Vetrivelan schreef op zo 13-03-2022 om 08:33 [+0530]:
> Is there any requirement for third party elisp packages to be /gpl3-
> or-later/?
> <https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01069.html>
>
> GPL-3-only should also be fine I think (at least, as long as the Emacs
> in Guix isn't updated to a new Emacs that is GPL4+)).  I guess that
> gpl2+ is also fine in Guix (at least for ‘old’ emacs packages that were
> written with ‘old’ GPL2+ Emacen in mind, perhaps also for other
> packages but I don't know the legalities of that at all) though I
> recommend the authors of these packages to update anyway (just in case,
> and because of <https://www.gnu.org/licenses/rms-why-gplv3.html>).

I'll read the link, thanks.

Here's the updated patch:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-emacs-xah-fly-keys.patch --]
[-- Type: text/x-patch, Size: 1863 bytes --]

From 5448f8ff41ba12dfd5388271ea8aad9e2ff20175 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sat, 12 Mar 2022 17:01:43 +0530
Subject: [PATCH] gnu: Add emacs-xah-fly-keys.

* gnu/packages/emacs-xyz.scm (emacs-xah-fly-keys): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 826c2141a9..eb98fa2ef6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14078,6 +14078,29 @@ (define-public emacs-xmlgen
 conversion for Emacs Lisp.")
     (license license:gpl2+)))
 
+(define-public emacs-xah-fly-keys
+  (let ((commit "6e974bd21f2d42aaa6d0b331a162cb554085b72e"))
+    (package
+    (name "emacs-xah-fly-keys")
+    (version "16.14.20220313004708")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/xahlee/xah-fly-keys")
+                   (commit commit)))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "0sk9ppnqgzc1xvqjp0qfw9jm6klxzrj23hapx4y4d0lmy454vbnb"))))
+    (build-system emacs-build-system)
+    (home-page "http://xahlee.info/emacs/misc/ergoemacs_vi_mode.html")
+    (synopsis "Modal keybinding system for emacs, based on command frequency and
+ergonomics.")
+    (description "xah-fly-keys.el is a modal editing mode for emacs, like vi,
+but the design of key/command choice is based on command frequency statistics
+and ease-of-key score. Most frequently used commands have most easy keys.")
+    (license license:gpl3))))
+
 (define-public emacs-cdlatex
   (package
     (name "emacs-cdlatex")

base-commit: 662f1f7bbac54d5762a06862b6174977003f46b9
-- 
2.34.0


[-- Attachment #1.3: Type: text/plain, Size: 23 bytes --]


-- 
Jai Vetrivelan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#54351] [PATCH] gnu: Add emacs-xah-fly-keys.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

Jai Vetrivelan schreef op zo 13-03-2022 om 16:18 [+0530]:
> +(define-public emacs-xah-fly-keys
> +  (let ((commit "6e974bd21f2d42aaa6d0b331a162cb554085b72e"))
> +    (package
> +    (name "emacs-xah-fly-keys")
> +    (version "16.14.20220313004708")
> +    (source (origin
> +             (method git-fetch)
> +             (uri (git-reference
> +                   (url "https://github.com/xahlee/xah-fly-keys")
> +                   (commit commit)))

'commit' is only used in one place, so the 'let' binding is not
necessary here, you could write

(git-reference
  (url "https://github.com/xahlee/xah-fly-keys")
  (commit ""6e974bd21f2d42aaa6d0b331a162cb554085b72e"))

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#54351: [PATCH] gnu: Add emacs-xah-fly-keys.

[Nicolas Goaziou]

Hello,

Jai Vetrivelan <jaivetrivelan@gmail.com> writes:

> This patch adds the xah-fly-keys package.

Applied with license fixed and let-binding removed, as Maxime Devos
suggested.

I also bumped it to latest release.

Thank you.

Regards,
-- 
Nicolas Goaziou