GNU bug report logs - #60549
[PATCH 2/5] gnu: Add emacs-citre.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 60549 in the body.
You can then email your comments to 60549 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: tumashu <at> 163.com
To: guix-patches <at> gnu.org
Cc: Feng Shu <tumashu <at> 163.com>
Subject: [PATCH 2/5] gnu: Add emacs-citre.
Date: Wed,  4 Jan 2023 20:46:44 +0800

From: Feng Shu <tumashu <at> 163.com>

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d4f0dc82a0..507ba3be61 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34104,6 +34104,63 @@ (define-public emacs-global-tags
 project.el and xref.el.")
       (license license:gpl3+))))
 
+(define-public emacs-citre
+  (package
+    (name "emacs-citre")
+    (version "0.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/universal-ctags/citre/")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "168z6yidh2nxkmdlx9cqdzzb7achxdipnbk5pj9787m9bp1sdpkd"))
+       (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-citre-ctags-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-sexps "citre-ctags.el"
+                ("defcustom citre-ctags-program"
+                 (string-append (assoc-ref inputs "universal-ctags")
+                                "/bin/ctags")))))
+          (add-after 'unpack 'patch-citre-readtags-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-sexps "citre-readtags.el"
+                ("defcustom citre-readtags-program"
+                 (string-append (assoc-ref inputs "universal-ctags")
+                                "/bin/readtags")))))
+          (add-after 'unpack 'patch-citre-gtags-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-sexps "citre-global.el"
+                ("defcustom citre-gtags-program"
+                 (string-append (assoc-ref inputs "global")
+                                "/bin/gtags")))))
+          (add-after 'unpack 'patch-citre-global-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-sexps "citre-global.el"
+                ("defcustom citre-global-program"
+                 (string-append (assoc-ref inputs "global")
+                                "/bin/global"))))))))
+    (inputs (list global universal-ctags))
+    (home-page "https://github.com/universal-ctags/citre")
+    (synopsis "Ctags IDE on the True Editor")
+    (description
+     "Citre is an advanced Ctags (or actually, readtags) frontend for
+Emacs. It offers:
+
+@itemize
+@item completion-at-point, xref and imenu integration.
+@item citre-jump: A completing-read UI for jumping to definition.
+@item citre-peek: A powerful code reading tool that lets you go down the
+rabbit hole without leaving current buffer.
+@end itemize\n")
+    (license license:gpl3+)))
+
 (define-public emacs-seq
   (package
     (name "emacs-seq")
-- 
2.38.1

Message #10 received at 60549-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: tumashu <at> 163.com
Cc: 60549-done <at> debbugs.gnu.org
Subject: Re: [bug#60549] [PATCH 2/5] gnu: Add emacs-citre.
Date: Sat, 07 Jan 2023 01:00:51 +0100

Hello,

tumashu <at> 163.com writes:

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

Applied, with the changes detailed below. Thank you.

> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'patch-citre-ctags-program
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (emacs-substitute-sexps "citre-ctags.el"
> +                ("defcustom citre-ctags-program"
> +                 (string-append (assoc-ref inputs "universal-ctags")
> +                                "/bin/ctags")))))
> +          (add-after 'unpack 'patch-citre-readtags-program
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (emacs-substitute-sexps "citre-readtags.el"
> +                ("defcustom citre-readtags-program"
> +                 (string-append (assoc-ref inputs "universal-ctags")
> +                                "/bin/readtags")))))
> +          (add-after 'unpack 'patch-citre-gtags-program
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (emacs-substitute-sexps "citre-global.el"
> +                ("defcustom citre-gtags-program"
> +                 (string-append (assoc-ref inputs "global")
> +                                "/bin/gtags")))))
> +          (add-after 'unpack 'patch-citre-global-program
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (emacs-substitute-sexps "citre-global.el"
> +                ("defcustom citre-global-program"
> +                 (string-append (assoc-ref inputs "global")
> +                                "/bin/global"))))))))

I merged everything into a single phase and used more specific
`emacs-substitute-variables' instead of `emacs-substitute-sexps'.

> +    (inputs (list global universal-ctags))
> +    (home-page "https://github.com/universal-ctags/citre")
> +    (synopsis "Ctags IDE on the True Editor")
> +    (description
> +     "Citre is an advanced Ctags (or actually, readtags) frontend for
> +Emacs. It offers:
> +
> +@itemize
> +@item completion-at-point, xref and imenu integration.
> +@item citre-jump: A completing-read UI for jumping to definition.
> +@item citre-peek: A powerful code reading tool that lets you go down the
> +rabbit hole without leaving current buffer.
> +@end itemize\n")

I reworded the description.

Regards,
-- 
Nicolas Goaziou

Message #13 received at 60549-done <at> debbugs.gnu.org (full text, mbox):

From: Feng Shu <tumashu <at> 163.com>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 60549-done <at> debbugs.gnu.org
Subject: Re: [bug#60549] [PATCH 2/5] gnu: Add emacs-citre.
Date: Sat, 07 Jan 2023 15:16:06 +0800

[Message part 1 (text/plain, inline)]

Nicolas Goaziou <mail <at> nicolasgoaziou.fr> writes:

Hello: 

emacs-citre now get the wrong ctags path, for emacs has ctags too. :-)

[0001-gnu-emacs-cire-Search-proper-ctags-program.patch (text/x-patch, inline)]

From 9b69ed1524cbe3aa3cb75b44fcb7453b43ee06c2 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu <at> 163.com>
Date: Sat, 7 Jan 2023 15:07:14 +0800
Subject: [PATCH] gnu: emacs-cire: Search proper ctags program

* gnu/packages/emacs-xyz.scm (emacs-citre) [arguments]<#:phases>: Do not use
search-input-file to search ctags, for it will get ctags of emacs-minimal
instead of universal-ctags.
---
 gnu/packages/emacs-xyz.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b6024925ec..4e7aa568ea 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34170,7 +34170,11 @@ (define-public emacs-citre
             (lambda* (#:key inputs #:allow-other-keys)
               (emacs-substitute-variables "citre-ctags.el"
                 ("citre-ctags-program"
-                 (search-input-file inputs "/bin/ctags")))
+                 ;; NOTE: Do not use search-input-file in this place, for it
+                 ;; will get ctags of emacs-minimal instead of
+                 ;; universal-ctags.
+                 (string-append (assoc-ref inputs "universal-ctags")
+                                "/bin/ctags")))
               (emacs-substitute-variables "citre-readtags.el"
                 ("citre-readtags-program"
                  (search-input-file inputs "/bin/readtags")))
-- 
2.38.1

[Message part 3 (text/plain, inline)]

> Hello,
>
> tumashu <at> 163.com writes:
>
>> * gnu/packages/emacs-xyz.scm (emacs-citre): New variable.
>
> Applied, with the changes detailed below. Thank you.
>
>> +      #~(modify-phases %standard-phases
>> +          (add-after 'unpack 'patch-citre-ctags-program
>> +            (lambda* (#:key inputs #:allow-other-keys)
>> +              (emacs-substitute-sexps "citre-ctags.el"
>> +                ("defcustom citre-ctags-program"
>> +                 (string-append (assoc-ref inputs "universal-ctags")
>> +                                "/bin/ctags")))))
>> +          (add-after 'unpack 'patch-citre-readtags-program
>> +            (lambda* (#:key inputs #:allow-other-keys)
>> +              (emacs-substitute-sexps "citre-readtags.el"
>> +                ("defcustom citre-readtags-program"
>> +                 (string-append (assoc-ref inputs "universal-ctags")
>> +                                "/bin/readtags")))))
>> +          (add-after 'unpack 'patch-citre-gtags-program
>> +            (lambda* (#:key inputs #:allow-other-keys)
>> +              (emacs-substitute-sexps "citre-global.el"
>> +                ("defcustom citre-gtags-program"
>> +                 (string-append (assoc-ref inputs "global")
>> +                                "/bin/gtags")))))
>> +          (add-after 'unpack 'patch-citre-global-program
>> +            (lambda* (#:key inputs #:allow-other-keys)
>> +              (emacs-substitute-sexps "citre-global.el"
>> +                ("defcustom citre-global-program"
>> +                 (string-append (assoc-ref inputs "global")
>> +                                "/bin/global"))))))))
>
> I merged everything into a single phase and used more specific
> `emacs-substitute-variables' instead of `emacs-substitute-sexps'.
>
>> +    (inputs (list global universal-ctags))
>> +    (home-page "https://github.com/universal-ctags/citre")> +    (synopsis "Ctags IDE on the True Editor")
>> +    (description
>> +     "Citre is an advanced Ctags (or actually, readtags) frontend for
>> +Emacs. It offers:
>> +
>> +@itemize
>> +@item completion-at-point, xref and imenu integration.
>> +@item citre-jump: A completing-read UI for jumping to definition.
>> +@item citre-peek: A powerful code reading tool that lets you go down the
>> +rabbit hole without leaving current buffer.
>> +@end itemize\n")
>
> I reworded the description.
>
> Regards,

-- 

Message #16 received at 60549-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Feng Shu <tumashu <at> 163.com>
Cc: 60549-done <at> debbugs.gnu.org
Subject: Re: [bug#60549] [PATCH 2/5] gnu: Add emacs-citre.
Date: Sat, 07 Jan 2023 12:11:28 +0100

Hello,

Feng Shu <tumashu <at> 163.com> writes:

> emacs-citre now get the wrong ctags path, for emacs has ctags too. :-)

Indeed! I applied your patch, but used `this-package-input' instead of
(assoc-ref …). Thank you.

Regards,
-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.