gnu: emacs-treemacs: Update package style.

* gnu/packages/emacs-xyz.scm (emacs-treemacs)[arguments]: Use
G-expressions.  Simplify PATCH-PATHS phase.  Move data within the ELPA directory.
This commit is contained in:
Nicolas Goaziou 2022-09-13 22:37:06 +02:00
parent 66b54aef0d
commit a24da5c8bc
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -25721,10 +25721,11 @@ processes for Emacs.")
(inputs (inputs
(list python)) (list python))
(arguments (arguments
`(#:tests? #t (list
#:test-command '("make" "-C" "../.." "test") #:tests? #t
#:test-command #~(list "make" "-C" "../.." "test")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-makefile (add-after 'unpack 'fix-makefile
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
@ -25739,38 +25740,38 @@ processes for Emacs.")
;; FIXME: 4 tests out of 254 are failing. ;; FIXME: 4 tests out of 254 are failing.
(lambda _ (lambda _
(emacs-batch-edit-file "../../test/treemacs-test.el" (emacs-batch-edit-file "../../test/treemacs-test.el"
`(progn '(progn
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "describe \"treemacs--parent\"") (re-search-forward "describe \"treemacs--parent\"")
(beginning-of-line) (beginning-of-line)
(kill-sexp) (kill-sexp)
(basic-save-buffer))))) (basic-save-buffer)))))
(add-before 'install 'patch-paths (add-before 'install 'patch-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "../.." ;treemacs root (make-file-writable "treemacs-core-utils.el")
(chmod "src/elisp/treemacs-core-utils.el" #o644) (emacs-substitute-variables "treemacs-core-utils.el"
(emacs-substitute-variables "src/elisp/treemacs-core-utils.el" ("treemacs-dir" (string-append #$output "/")))
("treemacs-dir" (make-file-writable "treemacs-icons.el")
(string-append (assoc-ref outputs "out") "/"))) (substitute* "treemacs-icons.el"
(chmod "src/elisp/treemacs-icons.el" #o644) (("icons/default")
(substitute* "src/elisp/treemacs-icons.el" (string-append (elpa-directory #$output) "/icons/default")))
(("icons/default") "share/emacs-treemacs/images")) (make-file-writable "treemacs-customization.el")
(chmod "src/elisp/treemacs-customization.el" #o644) (emacs-substitute-variables "treemacs-customization.el"
(emacs-substitute-variables "src/elisp/treemacs-customization.el"
("treemacs-python-executable" ("treemacs-python-executable"
(search-input-file inputs "/bin/python3"))) (search-input-file inputs "/bin/python3")))
(chmod "src/elisp/treemacs-async.el" #o644) (make-file-writable "treemacs-async.el")
(substitute* "src/elisp/treemacs-async.el" (substitute* "treemacs-async.el"
(("src/scripts") (string-append "share/" ,name "/scripts")))))) (("src/scripts")
(string-append (elpa-directory #$output) "/scripts")))))
(add-after 'install 'install-data (add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion "../.." ;treemacs root (with-directory-excursion "../.." ;treemacs root
(copy-recursively "icons/default" (copy-recursively
(string-append out "/share/" ,name "/images")) "icons/default"
(string-append (elpa-directory #$output) "/icons/default"))
(copy-recursively (copy-recursively
"src/scripts" "src/scripts"
(string-append out "/share/" ,name "/scripts"))))))))) (string-append (elpa-directory #$output) "/scripts"))))))))
(home-page "https://github.com/Alexander-Miller/treemacs") (home-page "https://github.com/Alexander-Miller/treemacs")
(synopsis "Emacs tree style file explorer") (synopsis "Emacs tree style file explorer")
(description (description