futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: emacs-ddskk: Update to 17.1-0.8c47f46.

Browse Source 
* 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.prikler@gmail.com>
This commit is contained in:
gemmaro 2024-06-22 08:02:54 +09:00 committed by Liliana Marie Prikler
parent b49e556b9e
commit 6e6bb64375
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/emacs-xyz.scm
View File

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