[bug#54474] [PATCH 0/6] gnu: emacs-xyz: Add info manuals of packages

[bug#54474] [PATCH 0/6] gnu: emacs-xyz: Add info manuals of packages

[Jai Vetrivelan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0000-cover-letter.patch --]
[-- Type: text/patch, Size: 1274 bytes --]

From e1df75980b273603e0d78e48317ef2df8cbbcae9 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 18:03:01 +0530
Subject: [PATCH 0/6] gnu: emacs-xyz: Add info manuals of packages

I noticed that a few packages had info manuals in their repositories, but they
were not installed by Guix. This patch series updates the existing definions
to add those Info manuals, and adds a few similar packages.

1) The .info files were generated from .org files in the repository and I
   attempted to install them through this command:

   "emacs --batch --eval=(require 'ox-texinfo) --eval=(find-file \"README.org\") --eval=(org-texinfo-export-to-info)"

   Is there a better way for this?

2) modus-themes is a part of emacs (since v28 iirc), would the info manual of
   emacs-modus-themes take precedence of the info manual provided with emacs?

Thanks.

Jai Vetrivelan (6):
  gnu: Add emacs-logos.
  gnu: Add emacs-pulsar.
  gnu: Add emacs-lin.
  gnu: Add emacs-tmr.
  gnu: emacs-modus-themes: Add Info manual.
  gnu: emacs-mct: Add Info manual.

 gnu/packages/emacs-xyz.scm | 158 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 156 insertions(+), 2 deletions(-)


base-commit: 57578256bf56522d6dc724716129bfe9467c0134
-- 
2.34.0

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Jai Vetrivelan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-emacs-logos.patch --]
[-- Type: text/patch, Size: 2265 bytes --]

From 085ca19fc6bdbb26ad96e7f818b1237fed1c884a Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:22:25 +0530
Subject: [PATCH 1/6] gnu: Add emacs-logos.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index dcd36291fb..f9df88040a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13129,6 +13129,42 @@ (define-public emacs-log4e
 you to deal with multiple log levels.")
     (license license:gpl3+)))
 
+(define-public emacs-logos
+  (package
+   (name "emacs-logos")
+   (version "0.2.0")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://gitlab.com/protesilaos/logos.git/")
+                  (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "0jsa2hyhg7z3ii43rijypy4ps22adk5ng6yv7nmrx286nrr1bggq"))))
+   (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'makeinfo
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "emacs"
+                     "--batch"
+                     "--eval=(require 'ox-texinfo)"
+                     "--eval=(find-file \"README.org\")"
+                     "--eval=(org-texinfo-export-to-info)")
+             (install-file "logos.info"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/info")))))))
+   (home-page "https://protesilaos.com/emacs/logos")
+   (synopsis "Simple focus mode for Emacs")
+   (description "This package provides a simple focus mode which can be applied
+to any buffer for reading, writing, or even doing a presentation.  The buffer
+can be divided in pages using the `page-delimiter', outline structure, or any
+other pattern.")
+   (license license:gpl3+))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-gn-mode
   (package
     (name "emacs-gn-mode")
-- 
2.34.0

[bug#54474] [PATCH 2/6] gnu: Add emacs-pulsar.

[Jai Vetrivelan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0002-gnu-Add-emacs-pulsar.patch --]
[-- Type: text/patch, Size: 2212 bytes --]

From 746670e132c27ef502336bf37c2ed9dac2af891a Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:22:58 +0530
Subject: [PATCH 2/6] gnu: Add emacs-pulsar.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f9df88040a..567dfc4eb8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18682,6 +18682,40 @@ (define-public emacs-pulseaudio-control
        "This package allows controlling @code{pulseaudio} from Emacs.")
       (license license:gpl3+))))
 
+(define-public emacs-pulsar
+  (package
+   (name "emacs-pulsar")
+   (version "0.2.0")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://gitlab.com/protesilaos/pulsar.git/")
+                  (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "1wfn15xqm7rsv963wvzbcrhnwr0xfv8fvcbzm7y6zjx6yfz4zmn0"))))
+      (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'makeinfo
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "emacs"
+                     "--batch"
+                     "--eval=(require 'ox-texinfo)"
+                     "--eval=(find-file \"README.org\")"
+                     "--eval=(org-texinfo-export-to-info)")
+             (install-file "pulsar.info"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/info")))))))
+   (home-page "https://protesilaos.com/emacs/pulsar")
+   (synopsis "Pulse highlight line on demand or after running select functions")
+   (description "This package temporarily highlights the current line after a
+given function is invoked.")
+   (license license:gpl3+))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-datetime
   (package
     (name "emacs-datetime")
-- 
2.34.0

[bug#54474] [PATCH 3/6] gnu: Add emacs-lin.

[Jai Vetrivelan]

[-- Attachment #1: 0003-gnu-Add-emacs-lin.patch --]
[-- Type: text/patch, Size: 2369 bytes --]

From 206367ee989b1c881aeeb857fca8bae7a901e0cf Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:23:42 +0530
Subject: [PATCH 3/6] gnu: Add emacs-lin.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 567dfc4eb8..eb2f857abd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13688,6 +13688,42 @@ (define-public emacs-linum-relative
 number on the left margin in Emacs.")
     (license license:gpl2+)))
 
+(define-public emacs-lin
+  (package
+   (name "emacs-lin")
+   (version "0.2.0")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://gitlab.com/protesilaos/lin.git/")
+                  (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "14aawkgqwwg0sv7wfz6b3f266vga2wjldm8vwdycyipcz89bf73w"))))
+   (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'makeinfo
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "emacs"
+                     "--batch"
+                     "--eval=(require 'ox-texinfo)"
+                     "--eval=(find-file \"README.org\")"
+                     "--eval=(org-texinfo-export-to-info)")
+             (install-file "lin.info"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/info")))))))
+   (home-page "https://protesilaos.com/emacs/lin")
+   (synopsis "Make @command{hl-line-mode} more suitable for selection UIs")
+   (description "Lin is a stylistic enhancement for Emacs’ built-in
+@command{hl-line-mode}.  It remaps the hl-line face (or equivalent)
+buffer-locally to a style that is optimal for major modes where line selection
+is the primary mode of interaction.")
+   (license license:gpl3+))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-idle-highlight
   (package
     (name "emacs-idle-highlight")
-- 
2.34.0

[bug#54474] [PATCH 4/6] gnu: Add emacs-tmr.

[Jai Vetrivelan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0004-gnu-Add-emacs-tmr.patch --]
[-- Type: text/patch, Size: 1487 bytes --]

From 75b66a3894235d525763293d8319c1e95e5f9074 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:25:25 +0530
Subject: [PATCH 4/6] gnu: Add emacs-tmr.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index eb2f857abd..a9aca35d65 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16317,6 +16317,26 @@ (define-public emacs-tracking
 through them using @key{C-c C-SPC}.")
     (license license:gpl3+)))
 
+(define-public emacs-tmr
+  (package
+   (name "emacs-tmr")
+   (version "0.1.0")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://gitlab.com/protesilaos/tmr.el.git/")
+                  (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "1q1wsxj6793y8bhn8vcnm8if8f7vn4r4jn6lwz4ys34niyzb15h8"))))
+   (build-system emacs-build-system)
+   (home-page "https://protesilaos.com/emacs/tmr")
+   (synopsis "Simple timer package for Emacs")
+   (description "This package provides a single command for setting a
+timer: @command{tmr}.")
+   (license license:gpl3+)))
+
 (define-public emacs-slack
   (let ((commit "1f6a40faec0d8d9c9de51c444508d05a3e995ccd")
         (revision "9"))
-- 
2.34.0

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Maxime Devos]

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

Jai Vetrivelan schreef op zo 20-03-2022 om 18:48 [+0530]:
> +   (license license:gpl3+))) ; GFDLv1.3+ for the manual

It's possible to include multiple license in this field, as a list,
see e.g. gnunet-scheme. 

Greetings,
MAxime.

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

[bug#54474] [PATCH 5/6] gnu: emacs-modus-themes: Add Info manual.

[Jai Vetrivelan]

[-- Attachment #1: 0005-gnu-emacs-modus-themes-Add-Info-manual.patch --]
[-- Type: text/patch, Size: 2048 bytes --]

From 355eb767d9b0013908980035cdfee361333c3280 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:27:00 +0530
Subject: [PATCH 5/6] gnu: emacs-modus-themes: Add Info manual.

* gnu/packages/emacs-xyz.scm (emacs-modus-themes): Add Info manual.
---
 gnu/packages/emacs-xyz.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a9aca35d65..6f69d30e86 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27454,7 +27454,21 @@ (define-public emacs-modus-themes
        (file-name (git-file-name name version))
        (sha256
         (base32 "1mnfbr312dqifsdngb29kvggfirfclc9ncaw5srd52hnwc5n0rxi"))))
+    (native-inputs (list texinfo))
     (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'makeinfo
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "emacs"
+                     "--batch"
+                     "--eval=(require 'ox-texinfo)"
+                     "--eval=(find-file \"doc/modus-themes.org\")"
+                     "--eval=(org-texinfo-export-to-info)")
+             (install-file "doc/modus-themes.info"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/info")))))))
     (home-page "https://protesilaos.com/modus-themes/")
     (synopsis "Accessible themes (WCAG AAA)")
     (description
@@ -27467,7 +27481,7 @@ (define-public emacs-modus-themes
 Vivendi (modus-vivendi) is dark.  Each theme’s color palette is designed to
 meet the needs of the numerous interfaces that are possible in the Emacs
 computing environment.")
-    (license license:gpl3+)))
+    (license license:gpl3+))) ; GFDLv1.3+ for the manual
 
 (define-public emacs-punpun-theme
   (let ((commit "7026684cd568cb691af3ced5de14c375fe6f5a1a")
-- 
2.34.0

[bug#54474] [PATCH 6/6] gnu: emacs-mct: Add Info manual.

[Jai Vetrivelan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0006-gnu-emacs-mct-Add-Info-manual.patch --]
[-- Type: text/patch, Size: 1997 bytes --]

From e1df75980b273603e0d78e48317ef2df8cbbcae9 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sun, 20 Mar 2022 17:27:00 +0530
Subject: [PATCH 6/6] gnu: emacs-mct: Add Info manual.

* gnu/packages/emacs-xyz.scm (emacs-mct): Add Info manual.
---
 gnu/packages/emacs-xyz.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6f69d30e86..9a00f7ce4a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1007,7 +1007,21 @@ (define-public emacs-mct
               (sha256
                (base32 "0714n5nim0hyd5jywvvddka2gi2bhi1vkrbhx75mdn8h50r688kq"))
               (file-name (git-file-name name version))))
+    (native-inputs (list texinfo))
     (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'makeinfo
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "emacs"
+                     "--batch"
+                     "--eval=(require 'ox-texinfo)"
+                     "--eval=(find-file \"README.org\")"
+                     "--eval=(org-texinfo-export-to-info)")
+             (install-file "mct.info"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/info")))))))
     (home-page "https://protesilaos.com/emacs/mct")
     (synopsis "Enhancement of the default Emacs minibuffer completion UI")
     (description "Minibuffer and Completions in Tandem, also known as MCT, or
@@ -1016,7 +1030,7 @@ (define-public emacs-mct
 framework.  The idea is to make the presentation and overall functionality be
 consistent with other popular, vertically aligned completion UIs while
 leveraging built-in functionality.")
-    (license license:gpl3+)))
+    (license license:gpl3+))) ; GFDLv1.3+ for the manual
 
 (define-public emacs-minions
   (package
-- 
2.34.0

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Maxime Devos]

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

Jai Vetrivelan schreef op zo 20-03-2022 om 18:48 [+0530]:
> `page-delimiter'

This is not Texinfo markup, maybe @code{...} is necessary here?

Greetings,
Maxime

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

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Nicolas Goaziou]

Hello,

Jai Vetrivelan <jaivetrivelan@gmail.com> writes:

> Subject: [PATCH 1/6] gnu: Add emacs-logos.
>
> * gnu/packages/emacs-xyz.scm (emacs-logos): New variable.

Thanks. Some comments follow.

>   (source (origin
>            (method git-fetch)
>            (uri (git-reference
>                  (url "https://gitlab.com/protesilaos/logos.git/")

You can drop the ".git" suffix, as mentioned by "guix lint".

> +    (arguments
> +     `(#:phases

You should use G-expressions here, if only to avoid writing

  (assoc-ref outputs "out")

which is too low level.

So:

  (arguments
   (list
    #:phases
    #~(modifiy phases ...)))

> +       (modify-phases %standard-phases
> +         (add-after 'install 'makeinfo
> +           (lambda* (#:key outputs #:allow-other-keys)

Here, this would become

  (lambda _
   ...)

> +             (invoke "emacs"
> +                     "--batch"
> +                     "--eval=(require 'ox-texinfo)"
> +                     "--eval=(find-file \"README.org\")"
> +                     "--eval=(org-texinfo-export-to-info)")
> +             (install-file "logos.info"
> +                           (string-append (assoc-ref outputs "out")
> +                                          "/share/info")))))))

And here:

  (install-file "logos.info" (string-append #$output "/share/info"))

The same goes for other packages.

Could you send updated patches?

Regards,
-- 
Nicolas Goaziou

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Jai Vetrivelan]

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

Hello Maxime,

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

> Jai Vetrivelan schreef op zo 20-03-2022 om 18:48 [+0530]:
>> +   (license license:gpl3+))) ; GFDLv1.3+ for the manual
>
> It's possible to include multiple license in this field, as a list,
> see e.g. gnunet-scheme. 
>
> Greetings,
> Maxime.

Noted.

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

> Jai Vetrivelan schreef op zo 20-03-2022 om 18:48 [+0530]:
>> `page-delimiter'
>
> This is not Texinfo markup, maybe @code{...} is necessary here?
>
> Greetings,
> Maxime

It is an emacs variable, would @code{..} be okay?

-- 
Jai Vetrivelan

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

[bug#54474] [PATCH 1/6] gnu: Add emacs-logos.

[Maxime Devos]

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

Jai Vetrivelan schreef op zo 20-03-2022 om 19:03 [+0530]:
> > Jai Vetrivelan schreef op zo 20-03-2022 om 18:48 [+0530]:
> > > `page-delimiter'
> > 
> > This is not Texinfo markup, maybe @code{...} is necessary here?
> > 
> > Greetings,
> > Maxime
> 
> It is an emacs variable, would @code{..} be okay?

That, or maybe even @lisp{...}.

Greetings,
Maxime.

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

[bug#54474] [PATCH 1/6] gnu: Add emacs-pulsar.

[Jai Vetrivelan]

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cd2367e842..80f8f6ab94 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18646,6 +18646,40 @@ (define-public emacs-pulseaudio-control
        "This package allows controlling @code{pulseaudio} from Emacs.")
       (license license:gpl3+))))
 
+(define-public emacs-pulsar
+  (package
+    (name "emacs-pulsar")
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/protesilaos/pulsar")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1wfn15xqm7rsv963wvzbcrhnwr0xfv8fvcbzm7y6zjx6yfz4zmn0"))))
+    (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'makeinfo
+            (lambda _
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"README.org\")"
+                      "--eval=(org-texinfo-export-to-info)")
+              (install-file "pulsar.info" (string-append #$output "/share/info")))))))
+    (home-page "https://protesilaos.com/emacs/pulsar")
+    (synopsis "Pulse highlight line on demand or after running select functions")
+    (description "This package temporarily highlights the current line after a
+given function is invoked.")
+    (license (list license:gpl3+
+                   license:fdl1.3+)))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-datetime
   (package
     (name "emacs-datetime")
-- 
2.34.0

[bug#54474] [PATCH 2/6] gnu: Add emacs-lin.

[Jai Vetrivelan]

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 80f8f6ab94..8b6cb159ff 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13652,6 +13652,42 @@ (define-public emacs-linum-relative
 number on the left margin in Emacs.")
     (license license:gpl2+)))
 
+(define-public emacs-lin
+  (package
+    (name "emacs-lin")
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/protesilaos/lin")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "14aawkgqwwg0sv7wfz6b3f266vga2wjldm8vwdycyipcz89bf73w"))))
+    (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'makeinfo
+            (lambda _
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"README.org\")"
+                      "--eval=(org-texinfo-export-to-info)")
+              (install-file "lin.info" (string-append #$output "/share/info")))))))
+    (home-page "https://protesilaos.com/emacs/lin")
+    (synopsis "Make @command{hl-line-mode} more suitable for selection UIs")
+    (description "Lin is a stylistic enhancement for Emacs’ built-in
+@command{hl-line-mode}.  It remaps the hl-line face (or equivalent)
+buffer-locally to a style that is optimal for major modes where line selection
+is the primary mode of interaction.")
+    (license (list license:gpl3+
+                   license:fdl1.3+)))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-idle-highlight
   (package
     (name "emacs-idle-highlight")
-- 
2.34.0

[bug#54474] [PATCH 3/6] gnu: Add emacs-logos.

[Jai Vetrivelan]

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8b6cb159ff..20bb882a14 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13129,6 +13129,42 @@ (define-public emacs-log4e
 you to deal with multiple log levels.")
     (license license:gpl3+)))
 
+(define-public emacs-logos
+  (package
+    (name "emacs-logos")
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/protesilaos/logos")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jsa2hyhg7z3ii43rijypy4ps22adk5ng6yv7nmrx286nrr1bggq"))))
+    (native-inputs (list texinfo))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'makeinfo
+            (lambda* (#:key outputs #:allow-other-keys)
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"README.org\")"
+                      "--eval=(org-texinfo-export-to-info)")
+              (install-file "logos.info" (string-append #$output "/share/info")))))))
+    (home-page "https://protesilaos.com/emacs/logos")
+    (synopsis "Simple focus mode for Emacs")
+    (description "This package provides a simple focus mode which can be applied
+to any buffer for reading, writing, or even doing a presentation.  The buffer
+can be divided in pages using the @lisp{page-delimiter}, outline structure, or any
+other pattern.")
+    (license (list license:gpl3+
+                   license:fdl1.3+)))) ; GFDLv1.3+ for the manual
+
 (define-public emacs-gn-mode
   (package
     (name "emacs-gn-mode")
-- 
2.34.0

[bug#54474] [PATCH 4/6] gnu: Add emacs-tmr.

[Jai Vetrivelan]

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 20bb882a14..c82f3e8297 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16317,6 +16317,26 @@ (define-public emacs-tracking
 through them using @key{C-c C-SPC}.")
     (license license:gpl3+)))
 
+(define-public emacs-tmr
+  (package
+    (name "emacs-tmr")
+    (version "0.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/protesilaos/tmr.el")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1q1wsxj6793y8bhn8vcnm8if8f7vn4r4jn6lwz4ys34niyzb15h8"))))
+    (build-system emacs-build-system)
+    (home-page "https://protesilaos.com/emacs/tmr")
+    (synopsis "Simple timer package for Emacs")
+    (description "This package provides a single command for setting a
+timer: @command{tmr}.")
+    (license license:gpl3+)))
+
 (define-public emacs-slack
   (let ((commit "1f6a40faec0d8d9c9de51c444508d05a3e995ccd")
         (revision "9"))
-- 
2.34.0

[bug#54474] [PATCH 5/6] gnu: emacs-modus-themes: Add Info manual.

[Jai Vetrivelan]

* gnu/packages/emacs-xyz.scm (emacs-modus-themes): Add Info manual.
---
 gnu/packages/emacs-xyz.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c82f3e8297..7d3ec85a25 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27454,7 +27454,20 @@ (define-public emacs-modus-themes
        (file-name (git-file-name name version))
        (sha256
         (base32 "1mnfbr312dqifsdngb29kvggfirfclc9ncaw5srd52hnwc5n0rxi"))))
+    (native-inputs (list texinfo))
     (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'makeinfo
+            (lambda _
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"doc/modus-themes.org\")"
+                      "--eval=(org-texinfo-export-to-info)")
+              (install-file "doc/modus-themes.info" (string-append #$output "/share/info")))))))
     (home-page "https://protesilaos.com/modus-themes/")
     (synopsis "Accessible themes (WCAG AAA)")
     (description
@@ -27467,7 +27480,8 @@ (define-public emacs-modus-themes
 Vivendi (modus-vivendi) is dark.  Each theme’s color palette is designed to
 meet the needs of the numerous interfaces that are possible in the Emacs
 computing environment.")
-    (license license:gpl3+)))
+    (license (list license:gpl3+
+                   license:fdl1.3+)))) ; GFDLv1.3+ for the manual
 
 (define-public emacs-punpun-theme
   (let ((commit "7026684cd568cb691af3ced5de14c375fe6f5a1a")
-- 
2.34.0

[bug#54474] [PATCH 6/6] gnu: emacs-mct: Add Info manual.

[Jai Vetrivelan]

* gnu/packages/emacs-xyz.scm (emacs-mct): Add Info manual.
---
 gnu/packages/emacs-xyz.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7d3ec85a25..04b570c4fc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1007,7 +1007,20 @@ (define-public emacs-mct
               (sha256
                (base32 "0714n5nim0hyd5jywvvddka2gi2bhi1vkrbhx75mdn8h50r688kq"))
               (file-name (git-file-name name version))))
+    (native-inputs (list texinfo))
     (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'makeinfo
+            (lambda _
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"README.org\")"
+                      "--eval=(org-texinfo-export-to-info)")
+              (install-file "mct.info" (string-append #$output "/share/info")))))))
     (home-page "https://protesilaos.com/emacs/mct")
     (synopsis "Enhancement of the default Emacs minibuffer completion UI")
     (description "Minibuffer and Completions in Tandem, also known as MCT, or
@@ -1016,7 +1029,8 @@ (define-public emacs-mct
 framework.  The idea is to make the presentation and overall functionality be
 consistent with other popular, vertically aligned completion UIs while
 leveraging built-in functionality.")
-    (license license:gpl3+)))
+    (license (list license:gpl3+
+                   license:fdl1.3+)))) ; GFDLv1.3+ for the manual
 
 (define-public emacs-minions
   (package
-- 
2.34.0

[bug#54474] [PATCH 0/6] gnu: emacs-xyz: Add info manuals of packages

[Liliana Marie Prikler]

Am Sonntag, dem 20.03.2022 um 18:03 +0530 schrieb Jai Vetrivelan:
> I noticed that a few packages had info manuals in their repositories,
> but they were not installed by Guix. This patch series updates the
> existing definions to add those Info manuals, and adds a few similar
> packages.
> 
> 1) The .info files were generated from .org files in the repository
>    and I attempted to install them through this command:
> 
>    "emacs --batch --eval=(require 'ox-texinfo) --eval=(find-file
> \"README.org\") --eval=(org-texinfo-export-to-info)"
> 
>    Is there a better way for this?
There is emacs-batch-eval in (guix build emacs-utils), which is already
part of the emacs-build-system imports.  This currently appears to only
affect six packages, but if that's a trend we might want to offer a
build phase for it.  Note that the default include regexp already
contains "\\.info$", so you only need to build it.

> 2) modus-themes is a part of emacs (since v28 iirc), would the info 
>    manual of emacs-modus-themes take precedence of the info manual
>    provided with emacs?
That'd probably depend on the ordering.  I'm not sure if installing
modus-themes on top of 28 is even expected, but whatever floats your
boat, I guess.

Cheers