[bug#71319] [PATCH 0/2] gnu: emacs-ddskk: Update to 17.1 revision 0.

[bug#71319] [PATCH 0/2] gnu: emacs-ddskk: Update to 17.1 revision 0.

[gemmaro]

Hello,

This updates emacs-ddskk to the latest commit.
It also applies the newer package style.

Best,
gemmaro.

gemmaro (2):
  gnu: emacs-ddskk: Update to 17.1 revision 0.
  gnu: emacs-ddskk: Improve package style.

 gnu/packages/emacs-xyz.scm | 59 ++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 28 deletions(-)


base-commit: fa7906d64881ee12e0c418136b44c73766e3d169
-- 
2.41.0

[bug#71319] [PATCH 1/2] gnu: emacs-ddskk: Update to 17.1 revision 0.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to version 17.1 revision
0 (commit 8c47f46).

Change-Id: Iefd35340dfaad9daf2dbba3bcb1524716e90bd21
---
 gnu/packages/emacs-xyz.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 75ea4d3a19..b4ce751b86 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -138,6 +138,7 @@
 ;;; Copyright © 2023 Ian Eure <ian@retrospec.tv>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 dan <i@dan.games>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36784,22 +36785,24 @@ (define-public emacs-org-static-blog
     (license license:bsd-3)))
 
 (define-public emacs-ddskk
-  ;; XXX: Upstream adds code names to their release tags, so version and code
-  ;; name below need to be updated together.
+  ;; XXX: Upstream adds code names to their release tags, so version
+  ;; and code name need to be declared and updated together when the
+  ;; next version is released (e.g. "Neppu" in 17.1.)
   (let ((version "17.1")
-        (code-name "Neppu"))
+        (commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (revision "0"))
     (package
       (name "emacs-ddskk")
-      (version version)
+      (version (git-version version revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/skk-dev/ddskk")
-               (commit (string-append "ddskk-" version "_" code-name))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+          (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)
-- 
2.41.0

[bug#71319] [PATCH 2/2] gnu: emacs-ddskk: Improve package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package style.

Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
---
 gnu/packages/emacs-xyz.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b4ce751b86..66a685c82d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -36805,28 +36805,28 @@ (define-public emacs-ddskk
           (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:modules ((guix build gnu-build-system)
-                    (guix build utils)
-                    (guix build emacs-utils))
-         #:imported-modules (,@%gnu-build-system-modules
-                             (guix build emacs-utils))
-         #:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (replace 'configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               (make-file-writable "SKK-MK")
-               (emacs-substitute-variables "SKK-MK"
-                 ("PREFIX" (assoc-ref outputs "out"))
-                 ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
-                 ("SKK_PREFIX" "")
-                 ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               (for-each make-file-writable (find-files "./doc"))
-               #t))
-           (add-after 'unpack 'fix-test
-             (lambda _
-               (substitute* "Makefile"
-                 (("/bin/rm") (which "rm"))))))))
+       (list #:modules '((guix build gnu-build-system)
+                         (guix build utils)
+                         (guix build emacs-utils))
+             #:imported-modules `(,@%gnu-build-system-modules
+                                  (guix build emacs-utils))
+             #:test-target "test"
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'configure
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (make-file-writable "SKK-MK")
+                     (emacs-substitute-variables "SKK-MK"
+                       ("PREFIX" (assoc-ref outputs "out"))
+                       ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
+                       ("SKK_PREFIX" "")
+                       ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
+                     (for-each make-file-writable (find-files "./doc"))
+                     #t))
+                 (add-after 'unpack 'fix-test
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
       (home-page "https://github.com/skk-dev/ddskk")
-- 
2.41.0

[bug#71319] [PATCH v2 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46).

Change-Id: Iefd35340dfaad9daf2dbba3bcb1524716e90bd21
---
 gnu/packages/emacs-xyz.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2a943f5846..14be801e9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -139,6 +139,7 @@
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 dan <i@dan.games>
 ;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36835,22 +36836,24 @@ (define-public emacs-org-static-blog
     (license license:bsd-3)))
 
 (define-public emacs-ddskk
-  ;; XXX: Upstream adds code names to their release tags, so version and code
-  ;; name below need to be updated together.
+  ;; XXX: Upstream adds code names to their release tags, so version
+  ;; and code name need to be declared and updated together when the
+  ;; next version is released (e.g. "Neppu" in 17.1.)
   (let ((version "17.1")
-        (code-name "Neppu"))
+        (commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (revision "0"))
     (package
       (name "emacs-ddskk")
-      (version version)
+      (version (git-version version revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/skk-dev/ddskk")
-               (commit (string-append "ddskk-" version "_" code-name))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+          (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)

base-commit: aed2e17768bc2a2bbac95066637bbf00a60765b2
-- 
2.45.1

[bug#71319] [PATCH v2 2/3] gnu: emacs-ddskk: Improve package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package style.

Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
---
 gnu/packages/emacs-xyz.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 14be801e9e..e6f5eb356c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -36856,28 +36856,28 @@ (define-public emacs-ddskk
           (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:modules ((guix build gnu-build-system)
-                    (guix build utils)
-                    (guix build emacs-utils))
-         #:imported-modules (,@%gnu-build-system-modules
-                             (guix build emacs-utils))
-         #:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (replace 'configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               (make-file-writable "SKK-MK")
-               (emacs-substitute-variables "SKK-MK"
-                 ("PREFIX" (assoc-ref outputs "out"))
-                 ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
-                 ("SKK_PREFIX" "")
-                 ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               (for-each make-file-writable (find-files "./doc"))
-               #t))
-           (add-after 'unpack 'fix-test
-             (lambda _
-               (substitute* "Makefile"
-                 (("/bin/rm") (which "rm"))))))))
+       (list #:modules '((guix build gnu-build-system)
+                         (guix build utils)
+                         (guix build emacs-utils))
+             #:imported-modules `(,@%gnu-build-system-modules
+                                  (guix build emacs-utils))
+             #:test-target "test"
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'configure
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (make-file-writable "SKK-MK")
+                     (emacs-substitute-variables "SKK-MK"
+                       ("PREFIX" (assoc-ref outputs "out"))
+                       ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
+                       ("SKK_PREFIX" "")
+                       ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
+                     (for-each make-file-writable (find-files "./doc"))
+                     #t))
+                 (add-after 'unpack 'fix-test
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
       (home-page "https://github.com/skk-dev/ddskk")
-- 
2.45.1

[bug#71319] [PATCH v2 2/3] gnu: emacs-ddskk: Improve package style.

[Nicolas Goaziou via Guix-patches via]

Hello,

gemmaro <gemmaro.dev@gmail.com> writes:

> * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer
> package style.

Thanks. Some comments follow.

> +       (list #:modules '((guix build gnu-build-system)
> +                         (guix build utils)
> +                         (guix build emacs-utils))
> +             #:imported-modules `(,@%gnu-build-system-modules
> +                                  (guix build emacs-utils))
> +             #:test-target "test"
> +             #:phases
> +             #~(modify-phases %standard-phases
> +                 (replace 'configure
> +                   (lambda* (#:key outputs #:allow-other-keys)

Use (lambda _ ...) here.

> +                     (make-file-writable "SKK-MK")

I don't think this line is necessary. Could you double-check?

> +                     (emacs-substitute-variables "SKK-MK"
> +                       ("PREFIX" (assoc-ref outputs "out"))

(assoc-ref outputs "out") -> #$output

> +                       ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
> +                       ("SKK_PREFIX" "")
> +                       ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
> +                     (for-each make-file-writable (find-files "./doc"))
> +                     #t))

Could you remove this trailing #T, too?

Regards,
-- 
Nicolas Goaziou

[bug#71319] [PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Use newer
package style.  This is necessary due to the emacs-ddskk package style update
since emacs-ddskk-nicola inherits this.  It also removes the last #t values
from the lambda expressions in phases.

Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f
---
 gnu/packages/emacs-xyz.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e6f5eb356c..4690fffc56 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -36894,25 +36894,25 @@ (define-public emacs-ddskk-nicola
     (propagated-inputs
      (list emacs-ddskk))
     (arguments
-     `(#:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (append
-          (list (string-append "PREFIX=" out)
-                (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))
-       #:tests? #f                      ; no tests in this subtree
-       ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'unpack 'chdir
-                 (lambda _
-                   (chdir "nicola")
-                   #t))
-               (replace 'configure
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (make-file-writable "NICOLA-DDSKK-CFG")
-                   (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
-                     ("setq NICOLA-DDSKK_PREFIX" ""))
-                   #t)))))))
+     (append
+      (list #:make-flags
+            #~(let ((out (assoc-ref %outputs "out")))
+                (append
+                 (list (string-append "PREFIX=" out)
+                       (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))
+            #:tests? #f                 ;no tests in this subtree
+            )
+      (substitute-keyword-arguments (package-arguments emacs-ddskk)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+             (add-after 'unpack 'chdir
+               (lambda _
+                 (chdir "nicola")))
+             (replace 'configure
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (make-file-writable "NICOLA-DDSKK-CFG")
+                 (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
+                   ("setq NICOLA-DDSKK_PREFIX" "")))))))))
     (synopsis "Nicola layout for Daredevil SKK")
     (description
      "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji
-- 
2.45.1

[bug#71319] [PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve package style.

[Nicolas Goaziou via Guix-patches via]

Hello,

gemmaro <gemmaro.dev@gmail.com> writes:

> * gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Use newer
> package style.  This is necessary due to the emacs-ddskk package style update
> since emacs-ddskk-nicola inherits this.  It also removes the last #t values
> from the lambda expressions in phases.

Thank you. Some comments follow.

> +     (append
> +      (list #:make-flags
> +            #~(let ((out (assoc-ref %outputs "out")))

You can remove this and use #$output instead.

> +                (append
> +                 (list (string-append "PREFIX=" out)
> +                       (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))

See above.

> +            #:tests? #f                 ;no tests in this subtree
> +            )

Please do not leave dangling parenthesis like this one.

> +      (substitute-keyword-arguments (package-arguments emacs-ddskk)
> +        ((#:phases phases)
> +         #~(modify-phases #$phases
> +             (add-after 'unpack 'chdir
> +               (lambda _
> +                 (chdir "nicola")))
> +             (replace 'configure
> +               (lambda* (#:key outputs #:allow-other-keys)
> +                 (make-file-writable "NICOLA-DDSKK-CFG")
> +                 (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
> +                   ("setq NICOLA-DDSKK_PREFIX" "")))))))))

You can use (lambda _ ...) instead of (lambda* (#:key outputs ...) ...)
since you don't make use of OUTPUTS argument.

Regards,
-- 
Nicolas Goaziou

[bug#71319] [PATCH v2 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.

[Nicolas Goaziou via Guix-patches via]

Hello,

gemmaro <gemmaro.dev@gmail.com> writes:

> * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision
> 0 (commit 8c47f46).

Thank you. Some comments follow.

>  (define-public emacs-ddskk
> -  ;; XXX: Upstream adds code names to their release tags, so version and code
> -  ;; name below need to be updated together.
> +  ;; XXX: Upstream adds code names to their release tags, so version
> +  ;; and code name need to be declared and updated together when the
> +  ;; next version is released (e.g. "Neppu" in 17.1.)

Since you're moving the package away from code names, you should also
remove references to them in the comment above. I.e., we just use
cherry-picked commits instead of tags.

>    (let ((version "17.1")
> -        (code-name "Neppu"))
> +        (commit "8c47f46e38a29a0f3eabcd524268d20573102467")
> +        (revision "0"))
>      (package
>        (name "emacs-ddskk")
> -      (version version)
> +      (version (git-version version revision commit))

You can replace version above with "17.1" and remove the binding above,
as it is usually done.

Regards,
-- 
Nicolas Goaziou

[bug#71319] [PATCH v3 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit
8c47f46).

Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79
---
 gnu/packages/emacs-xyz.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d000e7fd02..2eee8cfcb5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -141,6 +141,7 @@
 ;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37016,22 +37017,20 @@ (define-public emacs-org-static-blog
     (license license:bsd-3)))
 
 (define-public emacs-ddskk
-  ;; XXX: Upstream adds code names to their release tags, so version and code
-  ;; name below need to be updated together.
-  (let ((version "17.1")
-        (code-name "Neppu"))
+  (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (revision "0"))
     (package
       (name "emacs-ddskk")
-      (version version)
+      (version (git-version "17.1" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/skk-dev/ddskk")
-               (commit (string-append "ddskk-" version "_" code-name))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+          (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)

base-commit: e1a66d2ddd9b5ab382569f3a1130508797844d3b
-- 
2.45.1

[bug#71319] [PATCH v3 2/3] gnu: emacs-ddskk: Improve package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package
style.  Make use of gexps and #$output and removed trailing #t.  Also, SKK-MK
and doc files are not made writable, and the rm in nicola/Makefile is fixed.

Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
---
 gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2eee8cfcb5..855d75e390 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37033,28 +37033,27 @@ (define-public emacs-ddskk
           (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:modules ((guix build gnu-build-system)
-                    (guix build utils)
-                    (guix build emacs-utils))
-         #:imported-modules (,@%gnu-build-system-modules
-                             (guix build emacs-utils))
-         #:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (replace 'configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               (make-file-writable "SKK-MK")
-               (emacs-substitute-variables "SKK-MK"
-                 ("PREFIX" (assoc-ref outputs "out"))
-                 ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
-                 ("SKK_PREFIX" "")
-                 ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               (for-each make-file-writable (find-files "./doc"))
-               #t))
-           (add-after 'unpack 'fix-test
-             (lambda _
-               (substitute* "Makefile"
-                 (("/bin/rm") (which "rm"))))))))
+       (list #:modules '((guix build gnu-build-system)
+                         (guix build utils)
+                         (guix build emacs-utils))
+             #:imported-modules `(,@%gnu-build-system-modules
+                                  (guix build emacs-utils))
+             #:test-target "test"
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'configure
+                   (lambda _
+                     (emacs-substitute-variables "SKK-MK"
+                       ("PREFIX" #$output)
+                       ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
+                       ("SKK_PREFIX" "")
+                       ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))))
+                 (add-after 'unpack 'fix-test
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("/bin/rm") (which "rm")))
+                     (substitute* "nicola/Makefile"
+                       (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
       (home-page "https://github.com/skk-dev/ddskk")
-- 
2.45.1

[bug#71319] [PATCH v3 2/3] gnu: emacs-ddskk: Improve package style.

[Liliana Marie Prikler]

Am Donnerstag, dem 20.06.2024 um 08:32 +0900 schrieb gemmaro:
> * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer
> package
> style.  Make use of gexps and #$output and removed trailing #t. 
> Also, SKK-MK
> and doc files are not made writable, and the rm in nicola/Makefile is
> fixed.
This ChangeLog really could use some love.  "Use newer package style"
should probably go to the commit message (instead of "Improve package
style").

Also, don't sneak in actual code changes with formatting ones.  These
might need to go with the previous commit instead.

I'd suggest something like 

  … [arguments]: Convert to list of G-Expressions.
  Use #$output rather than the outputs alist.
  Removed trailing #t.

Cheers

[bug#71319] [PATCH v3 3/3] gnu: emacs-ddskk-nicola: Improve package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Use newer
package style.  This is necessary due to the emacs-ddskk package style update
since emacs-ddskk-nicola inherits this.  It also remove making
NICOLA-DDSKK-CFG writable, and removes the last #t values from the lambda
expressions in phases.

Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f
---
 gnu/packages/emacs-xyz.scm | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 855d75e390..fbdd58ab9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37070,25 +37070,23 @@ (define-public emacs-ddskk-nicola
     (propagated-inputs
      (list emacs-ddskk))
     (arguments
-     `(#:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (append
-          (list (string-append "PREFIX=" out)
-                (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))
-       #:tests? #f                      ; no tests in this subtree
-       ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'unpack 'chdir
-                 (lambda _
-                   (chdir "nicola")
-                   #t))
-               (replace 'configure
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (make-file-writable "NICOLA-DDSKK-CFG")
-                   (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
-                     ("setq NICOLA-DDSKK_PREFIX" ""))
-                   #t)))))))
+     (append
+      (list #:make-flags
+            #~(append
+                 (list (string-append "PREFIX=" #$output)
+                       (string-append "LISPDIR=" #$output "/share/emacs/site-lisp")))
+            ;; no tests in this subtree
+            #:tests? #f)
+      (substitute-keyword-arguments (package-arguments emacs-ddskk)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+             (add-after 'fix-test 'chdir
+               (lambda _
+                 (chdir "nicola")))
+             (replace 'configure
+               (lambda _
+                 (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
+                   ("setq NICOLA-DDSKK_PREFIX" "")))))))))
     (synopsis "Nicola layout for Daredevil SKK")
     (description
      "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji
-- 
2.45.1

[bug#71319] [PATCH v3 3/3] gnu: emacs-ddskk-nicola: Improve package style.

[Liliana Marie Prikler]

Am Donnerstag, dem 20.06.2024 um 08:32 +0900 schrieb gemmaro:
> * gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Use
> newer
> package style.  This is necessary due to the emacs-ddskk package
> style update
> since emacs-ddskk-nicola inherits this.  It also remove making
> NICOLA-DDSKK-CFG writable, and removes the last #t values from the
> lambda
> expressions in phases.
Again, don't sneak in code changes with formatting ones; and the
ChangeLog formatting hints to the previous patch mostly apply here as
well.

The "this is necessary, because…" part should probably go before the
ChangeLog, with the explanation that it is a follow-up to the previous
commit.

Cheers

[bug#71319] [PATCH v4 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46).
[arguments]: The SKK-MK and the doc files are now not explicitly made writable.
The rm in nicola/Makefile is fixed.
(emacs-ddskk-nicola)[arguments]: Move the chdir phase after the fix-test phase.
The NICOLA-DDSKK-CFG file is now not explicitly made writable.

Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79
---
 gnu/packages/emacs-xyz.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d000e7fd02..ae6f1ed3d9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -141,6 +141,7 @@
 ;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37016,22 +37017,20 @@ (define-public emacs-org-static-blog
     (license license:bsd-3)))
 
 (define-public emacs-ddskk
-  ;; XXX: Upstream adds code names to their release tags, so version and code
-  ;; name below need to be updated together.
-  (let ((version "17.1")
-        (code-name "Neppu"))
+  (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (revision "0"))
     (package
       (name "emacs-ddskk")
-      (version version)
+      (version (git-version "17.1" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/skk-dev/ddskk")
-               (commit (string-append "ddskk-" version "_" code-name))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+          (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)
@@ -37044,17 +37043,17 @@ (define-public emacs-ddskk
          (modify-phases %standard-phases
            (replace 'configure
              (lambda* (#:key outputs #:allow-other-keys)
-               (make-file-writable "SKK-MK")
                (emacs-substitute-variables "SKK-MK"
                  ("PREFIX" (assoc-ref outputs "out"))
                  ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
                  ("SKK_PREFIX" "")
                  ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               (for-each make-file-writable (find-files "./doc"))
                #t))
            (add-after 'unpack 'fix-test
              (lambda _
                (substitute* "Makefile"
+                 (("/bin/rm") (which "rm")))
+               (substitute* "nicola/Makefile"
                  (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
@@ -37081,13 +37080,12 @@ (define-public emacs-ddskk-nicola
        ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
            ((#:phases phases)
             `(modify-phases ,phases
-               (add-after 'unpack 'chdir
+               (add-after 'fix-test 'chdir
                  (lambda _
                    (chdir "nicola")
                    #t))
                (replace 'configure
                  (lambda* (#:key outputs #:allow-other-keys)
-                   (make-file-writable "NICOLA-DDSKK-CFG")
                    (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
                      ("setq NICOLA-DDSKK_PREFIX" ""))
                    #t)))))))

base-commit: 594419b09e124b84d3d6141f1e47b5c346eeb704
-- 
2.45.1

[bug#71319] [PATCH v4 2/3] gnu: emacs-ddskk: Use newer package style.

[gemmaro]

* gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]:
Convert to list of G-Expressions.
Use #$output rather than the outputs alist.
Removed #t.

Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
---
 gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ae6f1ed3d9..7128bbd1f1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37033,28 +37033,27 @@ (define-public emacs-ddskk
           (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:modules ((guix build gnu-build-system)
-                    (guix build utils)
-                    (guix build emacs-utils))
-         #:imported-modules (,@%gnu-build-system-modules
-                             (guix build emacs-utils))
-         #:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (replace 'configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               (emacs-substitute-variables "SKK-MK"
-                 ("PREFIX" (assoc-ref outputs "out"))
-                 ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
-                 ("SKK_PREFIX" "")
-                 ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               #t))
-           (add-after 'unpack 'fix-test
-             (lambda _
-               (substitute* "Makefile"
-                 (("/bin/rm") (which "rm")))
-               (substitute* "nicola/Makefile"
-                 (("/bin/rm") (which "rm"))))))))
+       (list #:modules '((guix build gnu-build-system)
+                         (guix build utils)
+                         (guix build emacs-utils))
+             #:imported-modules `(,@%gnu-build-system-modules
+                                  (guix build emacs-utils))
+             #:test-target "test"
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'configure
+                   (lambda _
+                     (emacs-substitute-variables "SKK-MK"
+                       ("PREFIX" #$output)
+                       ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
+                       ("SKK_PREFIX" "")
+                       ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))))
+                 (add-after 'unpack 'fix-test
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("/bin/rm") (which "rm")))
+                     (substitute* "nicola/Makefile"
+                       (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
       (home-page "https://github.com/skk-dev/ddskk")
-- 
2.45.1

[bug#71319] [PATCH v4 3/3] gnu: emacs-ddskk-nicola: Use new package style.

[gemmaro]

This is a follow-up to commit d8577f604e91a7deebc1c6928a140ac4cfda5895.

* gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]:
Convert to list of G-Expressions.
Use #$output rather than the outputs alist.
Removed trailing #t.

Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f
---
 gnu/packages/emacs-xyz.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7128bbd1f1..fbdd58ab9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37070,24 +37070,23 @@ (define-public emacs-ddskk-nicola
     (propagated-inputs
      (list emacs-ddskk))
     (arguments
-     `(#:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (append
-          (list (string-append "PREFIX=" out)
-                (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))
-       #:tests? #f                      ; no tests in this subtree
-       ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'fix-test 'chdir
-                 (lambda _
-                   (chdir "nicola")
-                   #t))
-               (replace 'configure
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
-                     ("setq NICOLA-DDSKK_PREFIX" ""))
-                   #t)))))))
+     (append
+      (list #:make-flags
+            #~(append
+                 (list (string-append "PREFIX=" #$output)
+                       (string-append "LISPDIR=" #$output "/share/emacs/site-lisp")))
+            ;; no tests in this subtree
+            #:tests? #f)
+      (substitute-keyword-arguments (package-arguments emacs-ddskk)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+             (add-after 'fix-test 'chdir
+               (lambda _
+                 (chdir "nicola")))
+             (replace 'configure
+               (lambda _
+                 (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
+                   ("setq NICOLA-DDSKK_PREFIX" "")))))))))
     (synopsis "Nicola layout for Daredevil SKK")
     (description
      "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji
-- 
2.45.1

bug#71319: [PATCH v4 3/3] gnu: emacs-ddskk-nicola: Use new package style.

[Liliana Marie Prikler]

Am Samstag, dem 22.06.2024 um 08:02 +0900 schrieb gemmaro:
> This is a follow-up to commit
> d8577f604e91a7deebc1c6928a140ac4cfda5895.
I avoided the breaking hash by squashing the two commits, just like the
prior update was squashed.  I've also reworded the previous commit to
refer to the actual version as output by Guix.

Anyhow, this is pushed now as commit
d69270b696a9badd0ba91fd1ec94f6f292ac1a53, so go and have fun with it :)