amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-ddskk: Use newer package style.

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

Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
gemmaro 2024-06-22 08:02:55 +09:00 • committed by Liliana Marie Prikler
parent 6e6bb64375
commit d69270b696
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

78
gnu/packages/emacs-xyz.scm
View file

@ -37033,28 +37033,27 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.")
(base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (list #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules `(,@%gnu-build-system-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:test-target "test" #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(emacs-substitute-variables "SKK-MK" (emacs-substitute-variables "SKK-MK"
("PREFIX" (assoc-ref outputs "out")) ("PREFIX" #$output)
("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)))))
#t)) (add-after 'unpack 'fix-test
(add-after 'unpack 'fix-test (lambda _
(lambda _ (substitute* "Makefile"
(substitute* "Makefile" (("/bin/rm") (which "rm")))
(("/bin/rm") (which "rm"))) (substitute* "nicola/Makefile"
(substitute* "nicola/Makefile" (("/bin/rm") (which "rm"))))))))
(("/bin/rm") (which "rm"))))))))
(native-inputs (native-inputs
(list emacs-minimal ruby)) (list emacs-minimal ruby))
(home-page "https://github.com/skk-dev/ddskk") (home-page "https://github.com/skk-dev/ddskk")
@ -37071,24 +37070,23 @@ conversion program}, a Japanese input method on Emacs.")
(propagated-inputs (propagated-inputs
(list emacs-ddskk)) (list emacs-ddskk))
(arguments (arguments
`(#:make-flags (append
(let ((out (assoc-ref %outputs "out"))) (list #:make-flags
(append #~(append
(list (string-append "PREFIX=" out) (list (string-append "PREFIX=" #$output)
(string-append "LISPDIR=" out "/share/emacs/site-lisp")))) (string-append "LISPDIR=" #$output "/share/emacs/site-lisp")))
#:tests? #f ; no tests in this subtree ;; no tests in this subtree
,@(substitute-keyword-arguments (package-arguments emacs-ddskk) #:tests? #f)
((#:phases phases) (substitute-keyword-arguments (package-arguments emacs-ddskk)
`(modify-phases ,phases ((#:phases phases)
(add-after 'fix-test 'chdir #~(modify-phases #$phases
(lambda _ (add-after 'fix-test 'chdir
(chdir "nicola") (lambda _
#t)) (chdir "nicola")))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(emacs-substitute-sexps "NICOLA-DDSKK-CFG" (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
("setq NICOLA-DDSKK_PREFIX" "")) ("setq NICOLA-DDSKK_PREFIX" "")))))))))
#t)))))))
(synopsis "Nicola layout for Daredevil SKK") (synopsis "Nicola layout for Daredevil SKK")
(description (description
"Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji