lilyp pushed a commit to branch master
in repository guix.
commit 6e6bb643750cb1441f702d2229978c288177a17b
Author: gemmaro <gemmaro....@gmail.com>
AuthorDate: Sat Jun 22 08:02:54 2024 +0900
gnu: emacs-ddskk: Update to 17.1-0.8c47f46.
* gnu/packages/emacs-xyz.scm (emacs-ddskk): 17.1-0.8c47f46.
[#:phases]<configure>: Do not explicitly make SKK-MK or doc files writable.
<fix-test>: Also patch “/bin/rm” in nicola/Makefile.
(emacs-ddskk-nicola)[#:phases]: Move ‘chdir’ phase after ‘fix-test’.
<configure>: Do not explicitly make NICOLA-DDSKK-CFG writable.
Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79
Signed-off-by: Liliana Marie Prikler <liliana.prik...@gmail.com>
---
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 0abaf81a77..1f440630ca 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -141,6 +141,7 @@
;;; Copyright © 2024 Ilya Chernyshov <ichernysho...@gmail.com>
;;; Copyright © 2024 Wilko Meyer <w...@wmeyer.eu>
;;; Copyright © 2024 Noé Lopez <noelo...@free.fr>
+;;; Copyright © 2024 gemmaro <gemmaro....@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37016,22 +37017,20 @@ a @samp{date} keywords, and optionally, a
@samp{filetags} keyword.")
(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 @@ a @samp{date} keywords, and optionally, a
@samp{filetags} keyword.")
(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 @@ conversion program}, a Japanese input method on
Emacs.")
,@(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)))))))
