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

  • Open
  • quality assurance status badge
Details
One participant
  • gemmaro
Owner
unassigned
Submitted by
gemmaro
Severity
normal
G
G
gemmaro wrote on 2 Jun 09:56 +0200
(address . guix-patches@gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
cover.1717314904.git.gemmaro.dev@gmail.com
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
G
G
gemmaro wrote on 2 Jun 11:08 +0200
[PATCH 1/2] gnu: emacs-ddskk: Update to 17.1 revision 0.
(address . 71319@debbugs.gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
3e991841bf01280a06d083d3f51db71199599ac7.1717314904.git.gemmaro.dev@gmail.com
* 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(-)

Toggle diff (45 lines)
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
G
G
gemmaro wrote on 2 Jun 11:08 +0200
[PATCH 2/2] gnu: emacs-ddskk: Improve package style.
(address . 71319@debbugs.gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
f40ed4cbd943a61c5c5404bdbf4ccd4c750d48b6.1717314904.git.gemmaro.dev@gmail.com
* 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(-)

Toggle diff (57 lines)
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
G
G
gemmaro wrote 3 days ago
[PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve package style.
(address . 71319@debbugs.gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
80aa9ac79b1b8577ce04dec98909fb9e2d0bf9fc.1718104831.git.gemmaro.dev@gmail.com
* 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(-)

Toggle diff (51 lines)
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
G
G
gemmaro wrote 3 days ago
[PATCH v2 2/3] gnu: emacs-ddskk: Improve package style.
(address . 71319@debbugs.gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
73fdffde326d9fdb418056b636e08be7b5be8644.1718104831.git.gemmaro.dev@gmail.com
* 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(-)

Toggle diff (57 lines)
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
G
G
gemmaro wrote 3 days ago
[PATCH v2 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.
(address . 71319@debbugs.gnu.org)(name . gemmaro)(address . gemmaro.dev@gmail.com)
4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com
* 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(-)

Toggle diff (47 lines)
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
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 71319@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 71319
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch