me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-telega: Update to 0.6.27-1.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.6.27-1.

[source]: Take a new commit that includes the latest .el files from the
contrib subdirectory.

[arguments]: Add a substitute method for the 'telega-install-contrib phase to
know where telega-contrib is located, and use it appropriately.

[arguments]: Manually invoke bytecompilation as a separate step for the
contrib directory.

[arguments]: Add 'telega-install-contrib phase to place the contrib directory
files in a more guix-suitable place.
This commit is contained in:
Brett Gilio 2020-07-19 23:54:32 -05:00
parent 00b6558811
commit cd0c4268d7
No known key found for this signature in database
GPG key ID: F6C52DD1BA27CB87
1 changed files with 29 additions and 6 deletions

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

@ -22242,8 +22242,8 @@ fish-completion. It can be used in both Eshell and M-x shell.")
;; This package has versions newer than indicated on MELPA. ;; This package has versions newer than indicated on MELPA.
;; Get the current version from `telega-version` in telega.el. ;; Get the current version from `telega-version` in telega.el.
;; or by running M-x telega-version. ;; or by running M-x telega-version.
(let ((commit "5fd725ef8e0b4cf2eb908b1f48638a9d5df49b93") (let ((commit "5c39c3a81e48222911db75ae30e5a8f8fa34efb5")
(revision "0") (revision "1")
(version "0.6.27")) (version "0.6.27"))
(package (package
(name "emacs-telega") (name "emacs-telega")
@ -22256,7 +22256,7 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1852xkd8pq1g6c74nm8kbgiglsig7cyizp2igr4mydln2pak0ccx")) "0wyycgsb1ja73phs9a2dgi50m2p6sdvx3xdwclfyijx4hzwlv233"))
(patches (search-patches "emacs-telega-test-env.patch")) (patches (search-patches "emacs-telega-test-env.patch"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -22307,6 +22307,13 @@ fish-completion. It can be used in both Eshell and M-x shell.")
"(concat \"telega-data/\" filename) "(concat \"telega-data/\" filename)
(locate-dominating-file telega--lib-directory (locate-dominating-file telega--lib-directory
\"telega-data\")")) \"telega-data\")"))
;; Modify telega.el to reflect unique dir name in
;; `telega-install-contrib' phase.
(substitute* "telega.el"
(("\\(push \\(expand-file-name \"contrib\" telega--lib-directory\\) load-path\\)")
"(push (expand-file-name \"telega-contrib\"
(locate-dominating-file telega--lib-directory
\"telega-contrib\")) load-path)"))
#t)) #t))
;; The server test suite has a hardcoded path. ;; The server test suite has a hardcoded path.
;; Reset this behavior to use the proper path. ;; Reset this behavior to use the proper path.
@ -22325,7 +22332,16 @@ fish-completion. It can be used in both Eshell and M-x shell.")
;; Build emacs-side using `emacs-build-system' ;; Build emacs-side using `emacs-build-system'
(add-after 'compress-documentation 'emacs-add-source-to-load-path (add-after 'compress-documentation 'emacs-add-source-to-load-path
(assoc-ref emacs:%standard-phases 'add-source-to-load-path)) (assoc-ref emacs:%standard-phases 'add-source-to-load-path))
(add-after 'emacs-add-source-to-load-path 'emacs-install ;; Manually invoke bytecompilation for the contrib
;; subdirectory.
(add-after 'emacs-add-source-to-load-path 'emacs-bytecomp-contrib
(lambda _
(substitute* "Makefile"
(("byte-recompile-directory \".\"")
"byte-recompile-directory \"contrib\""))
(invoke "make" "compile")
#t))
(add-after 'emacs-bytecomp-contrib 'emacs-install
(assoc-ref emacs:%standard-phases 'install)) (assoc-ref emacs:%standard-phases 'install))
;; This step installs subdir /etc, which contains images, sounds and ;; This step installs subdir /etc, which contains images, sounds and
;; various other data, next to the site-lisp dir. ;; various other data, next to the site-lisp dir.
@ -22336,9 +22352,16 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/emacs/telega-data/")) "/share/emacs/telega-data/"))
#t)) #t))
(add-after 'telega-install-data 'emacs-build (add-after 'emacs-install 'telega-install-contrib
(lambda* (#:key outputs #:allow-other-keys)
(copy-recursively
"contrib"
(string-append (assoc-ref outputs "out")
"/share/emacs/telega-contrib"))
#t))
(add-after 'telega-install-contrib 'emacs-build
(assoc-ref emacs:%standard-phases 'build)) (assoc-ref emacs:%standard-phases 'build))
(add-after 'emacs-build 'emacs-make-autoloads (add-after 'telega-install-contrib 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads))))) (assoc-ref emacs:%standard-phases 'make-autoloads)))))
(inputs (inputs
`(("ffmpeg" ,ffmpeg))) ; mp4/gif support. `(("ffmpeg" ,ffmpeg))) ; mp4/gif support.