[bug#66566] [PATCH 0/3] Refactor GNU poke definition.

[bug#66566] [PATCH 0/3] Refactor GNU poke definition.

[Bruno Victal]

Notable changes:
* Removed obsolete comments and inputs from poke.
* Subsumed emacs-poke into poke.
  NOTE: The emacs-poke naming is confusing as there exists a ELPA poke package
  which is an emacs interface for GNU poke. The modes provided by our emacs-poke
  package are seldomly used and emacs/poke people are mostly looking for
  emacs-poke-mode which is being added with #66561 [1] so to prevent intolerable
  confusion in the future emacs-poke has been pre-emptively removed to make way
  for the ELPA poke.

[1]: <https://issues.guix.gnu.org/66561>

Bruno Victal (3):
  gnu: poke: Revise package definition.
  gnu: poke: Install emacs modes.
  gnu: Remove emacs-poke.

 gnu/packages/engineering.scm | 39 +++++++++++-------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)


base-commit: a0d2ecde943bd1854ddbb7c0cad35a1fc64dc5ab
-- 
2.41.0

[bug#66566] [PATCH 1/3] gnu: poke: Revise package definition.

[Bruno Victal]

Rewrite package using G-Expressions. Remove obsolete comments, options and
unused dependencies [1].

[1]: GNU poke commit: c17b0fb7d9d0b97398c664c882d6ef1e732bc66a

* gnu/packages/engineering.scm (poke)[inputs]: Remove json-c.
[arguments]: Use G-Expression. Remove obsolete comments and configure-flags.
---
 gnu/packages/engineering.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index c9aec482da..46937384e4 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3248,18 +3248,15 @@ (define-public poke
                   (delete-file "libpoke/pvm-vm1.c")
                   (delete-file "libpoke/pvm-vm2.c")))))
     (build-system gnu-build-system)
-    ;; The GUI, which we elide, requires tcl and tk.
     (native-inputs (list bison dejagnu flex libtool pkg-config))
     ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged).
-    (inputs (list json-c libgc readline libtextstyle))
+    (inputs (list libgc readline libtextstyle))
     (arguments
-     ;; To build the GUI, add the `--enable-gui' configure flag.
-     ;; To enable the "hyperlink server", add the `--enable-hserver' flag.
-     `(#:configure-flags
-       '("--enable-mi"
-         "--disable-static"
-         ;; The emacs files are provided in emacs-poke.
-         "--with-lispdir=/tmp/share/emacs")))
+     (list
+      #:configure-flags
+      #~(list "--disable-static"
+              ;; The emacs files are provided in emacs-poke.
+              "--with-lispdir=/tmp/share/emacs")))
     (home-page "https://www.gnu.org/software/poke/#documentation")
     (synopsis "Editing of arbitrary binary data")
     (description "GNU poke is an interactive, extensible editor for binary data.
-- 
2.41.0

[bug#66566] [PATCH 2/3] gnu: poke: Install emacs modes.

[Bruno Victal]

* gnu/packages/engineering.scm (poke)[arguments]<#:configure-flags>: Correctly
set lispdir for emacs.
---
 gnu/packages/engineering.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 46937384e4..112417b30e 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3253,10 +3253,16 @@ (define-public poke
     (inputs (list libgc readline libtextstyle))
     (arguments
      (list
+      #:imported-modules `((guix build emacs-build-system)
+                           (guix build emacs-utils)
+                           ,@%gnu-build-system-modules)
+      #:modules '((guix build gnu-build-system)
+                  ((guix build emacs-build-system) #:prefix emacs:)
+                  (guix build utils))
       #:configure-flags
       #~(list "--disable-static"
-              ;; The emacs files are provided in emacs-poke.
-              "--with-lispdir=/tmp/share/emacs")))
+              (string-append "--with-lispdir="
+                             (emacs:elpa-directory #$output)))))
     (home-page "https://www.gnu.org/software/poke/#documentation")
     (synopsis "Editing of arbitrary binary data")
     (description "GNU poke is an interactive, extensible editor for binary data.
-- 
2.41.0

[bug#66566] [PATCH 3/3] gnu: Remove emacs-poke.

[Bruno Victal]

This naming conflicts with the ELPA 'poke' package, a emacs interface to
GNU poke.

* gnu/packages/engineering.scm (emacs-poke): Remove variable.
---
 gnu/packages/engineering.scm | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 112417b30e..a00c098f90 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3271,24 +3271,6 @@ (define-public poke
 data structures and to operate on them.")
     (license license:gpl3+)))
 
-(define-public emacs-poke
-  (package
-    (inherit poke)
-    (name "emacs-poke")
-    (build-system emacs-build-system)
-    (arguments
-     (list
-       #:phases
-       #~(modify-phases %standard-phases
-           (add-before 'expand-load-path 'change-working-directory
-             (lambda _ (chdir "etc"))))))
-    (inputs '())
-    (native-inputs '())
-    (synopsis "GNU Poke major modes for Emacs")
-    (description
-     "This package provides two Emacs major modes for working with GNU Poke:
-@code{Poke Ras mode} and @code{Poke Map mode}.")))
-
 (define-public pcb2gcode
   (package
    (name "pcb2gcode")
-- 
2.41.0

[bug#66566] [PATCH 3/3] gnu: Remove emacs-poke.

[Efraim Flashner]

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

Does it make more sense to either replace this package with the ELPA
poke package, or to deprecate this package and have it point back at
poke?

On Sun, Oct 15, 2023 at 06:47:08PM +0100, Bruno Victal wrote:
> This naming conflicts with the ELPA 'poke' package, a emacs interface to
> GNU poke.
> 
> * gnu/packages/engineering.scm (emacs-poke): Remove variable.
> ---
>  gnu/packages/engineering.scm | 18 ------------------
>  1 file changed, 18 deletions(-)
> 
> diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
> index 112417b30e..a00c098f90 100644
> --- a/gnu/packages/engineering.scm
> +++ b/gnu/packages/engineering.scm
> @@ -3271,24 +3271,6 @@ (define-public poke
>  data structures and to operate on them.")
>      (license license:gpl3+)))
>  
> -(define-public emacs-poke
> -  (package
> -    (inherit poke)
> -    (name "emacs-poke")
> -    (build-system emacs-build-system)
> -    (arguments
> -     (list
> -       #:phases
> -       #~(modify-phases %standard-phases
> -           (add-before 'expand-load-path 'change-working-directory
> -             (lambda _ (chdir "etc"))))))
> -    (inputs '())
> -    (native-inputs '())
> -    (synopsis "GNU Poke major modes for Emacs")
> -    (description
> -     "This package provides two Emacs major modes for working with GNU Poke:
> -@code{Poke Ras mode} and @code{Poke Map mode}.")))
> -
>  (define-public pcb2gcode
>    (package
>     (name "pcb2gcode")
> -- 
> 2.41.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#66566] [PATCH 3/3] gnu: Remove emacs-poke.

[Bruno Victal]

Hi Efraim,

On 2023-10-16 10:23, Efraim Flashner wrote:
> Does it make more sense to either replace this package with the ELPA
> poke package, or to deprecate this package and have it point back at
> poke?

I'd say it makes sense to replace it with the ELPA one to avoid confusion,
though I didn't do so here since I'm not planning on using it (yet) and
thus can't vouch whether it works or not.

-- 
Furthermore, I consider that nonfree software must be eradicated.

Cheers,
Bruno.

[bug#66566] [PATCH 3/3] gnu: Remove emacs-poke.

[Ludovic Courtès]

Hi!

Bruno Victal <mirai@makinata.eu> skribis:

> On 2023-10-16 10:23, Efraim Flashner wrote:
>> Does it make more sense to either replace this package with the ELPA
>> poke package, or to deprecate this package and have it point back at
>> poke?
>
> I'd say it makes sense to replace it with the ELPA one to avoid confusion,
> though I didn't do so here since I'm not planning on using it (yet) and
> thus can't vouch whether it works or not.

But since ‘poke’ now provides the Emacs mode, should we:

  (define-public emacs-poke
    (deprecated-package "emacs-poke" poke))

for now?

(I can do it on your behalf, let me know.)

Ludo’.

[bug#66566] [PATCH 3/3] gnu: Remove emacs-poke.

[Bruno Victal]

Hi Ludo’,

On 2023-10-20 23:20, Ludovic Courtès wrote:
> But since ‘poke’ now provides the Emacs mode, should we:
> 
>   (define-public emacs-poke
>     (deprecated-package "emacs-poke" poke))
> 
> for now?
> 
> (I can do it on your behalf, let me know.)

Go ahead! I think there's no harm in doing this but do leave a comment
above it indicating that the package can be substituted anytime in the
future with the ELPA 'poke'.

-- 
Furthermore, I consider that nonfree software must be eradicated.

Cheers,
Bruno.

bug#66566: [PATCH 3/3] gnu: Remove emacs-poke.

[Ludovic Courtès]

Hi Bruno,

Bruno Victal <mirai@makinata.eu> skribis:

> On 2023-10-20 23:20, Ludovic Courtès wrote:
>> But since ‘poke’ now provides the Emacs mode, should we:
>> 
>>   (define-public emacs-poke
>>     (deprecated-package "emacs-poke" poke))
>> 
>> for now?
>> 
>> (I can do it on your behalf, let me know.)
>
> Go ahead! I think there's no harm in doing this but do leave a comment
> above it indicating that the package can be substituted anytime in the
> future with the ELPA 'poke'.

Done, thanks!

Ludo’.