diff options
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 306 |
1 files changed, 164 insertions, 142 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cd435fa56b..56d3af4a92 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -55,7 +55,7 @@ ;;; Copyright © 2019 Jelle Licht <[email protected]> ;;; Copyright © 2019 Björn Höfling <[email protected]> ;;; Copyright © 2019 Stephen Webber <[email protected]> -;;; Copyright © 2019, 2021 Leo Prikler <[email protected]> +;;; Copyright © 2019, 2021 Liliana Marie Prikler <[email protected]> ;;; Copyright © 2019 David Wilson <[email protected]> ;;; Copyright © 2020 Paul Garlick <[email protected]> ;;; Copyright © 2020 Robert Smith <[email protected]> @@ -74,7 +74,6 @@ ;;; Copyright © 2020 Ryan Desfosses <[email protected]> ;;; Copyright © 2020 Marcin Karpezo <[email protected]> ;;; Copyright © 2020 Fredrik Salomonsson <[email protected]> -;;; Copyright © 2020 Ryan Desfosses <[email protected]> ;;; Copyright © 2020 Eric Bavier <[email protected]> ;;; Copyright © 2020, 2021 Morgan Smith <[email protected]> ;;; Copyright © 2020 Peng Mei Yu <[email protected]> @@ -634,13 +633,13 @@ when typing parentheses directly or commenting out code line by line.") (define-public emacs-project (package (name "emacs-project") - (version "0.6.1") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar")) (sha256 - (base32 "174fli3swbn67qcs9isv70vwrf6r41mak6dbs98gia89rlb71c8v")))) + (base32 "1ip8s924n50mmh068p42zi0ylvv79a2pi9sji1c2pqj2q19d7jr6")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xref" ,emacs-xref))) (home-page "http://elpa.gnu.org/packages/project.html") @@ -2120,14 +2119,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "7.6") + (version "7.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "03cp6mr0kxy41dg4ri5ymbzpkw7bd8zg7hx0a2rb4axiss5qmx7i")))) + (base32 "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h")))) (build-system gnu-build-system) (arguments `(#:make-flags '("emms-print-metadata") @@ -2773,6 +2772,34 @@ the ability to jump forward and backward to the next bookmark.") Emacs buffer.") (license license:gpl3+))) +(define-public emacs-caml + (package + (name "emacs-caml") + (version "4.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.nongnu.org/nongnu/caml-" + version ".tar")) + (sha256 + (base32 + "00ldvz6r10vwwmk6f3az534p0340ywn7knsg2bmvbvh3q51vyl9i")))) + (build-system emacs-build-system) + (home-page "https://github.com/ocaml/caml-mode") + (synopsis "Caml mode for GNU Emacs") + (description + "This package provides a major mode for editing OCaml code in Emacs. +Some of its major features include: + +@itemize +@item syntax highlighting (font lock); +@item automatic indentation; +@item querying the type of expressions (using compiler generated annot files); +@item running an OCaml REPL within Emacs; +@item scanning of declarations and placing them in a menu. +@end itemize") + (license license:gpl2+))) + (define-public emacs-caps-lock (package (name "emacs-caps-lock") @@ -4915,7 +4942,7 @@ configuration, cache, and other data.") (define-public emacs-string-inflection (package (name "emacs-string-inflection") - (version "1.0.14") + (version "1.0.16") (source (origin (method git-fetch) (uri (git-reference @@ -4924,7 +4951,7 @@ configuration, cache, and other data.") (file-name (git-file-name name version)) (sha256 (base32 - "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd")))) + "0wskrp3v5gi3b3s9471ijkdncnfd888qd50c72rv2p8846174paj")))) (build-system emacs-build-system) (native-inputs `(("ert-runner" ,emacs-ert-runner))) @@ -5987,14 +6014,14 @@ src blocks.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0")))) + (base32 "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs @@ -6253,7 +6280,7 @@ languages.") (define-public emacs-irony-mode (package (name "emacs-irony-mode") - (version "1.4.0") + (version "1.5.0") (home-page "https://github.com/Sarcasm/irony-mode") (source (origin (method git-fetch) @@ -6263,7 +6290,7 @@ languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0n2nfcq58md1p2xdhq1smh8v7lsyj0ci7ma5xyd6bkg5rvhsh10i")))) + "1ilvfqn7hzrjjy2zrv08dbdnmgksdgsmrdcvx05s8704430ag0pb")))) (build-system emacs-build-system) (inputs `(("server" ,emacs-irony-mode-server))) (arguments `(#:phases @@ -8291,7 +8318,7 @@ list of candidates.") (define-public emacs-consult-notmuch (package (name "emacs-consult-notmuch") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -8300,11 +8327,11 @@ list of candidates.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x2lz2df1rjq3vdxvqqnxqxh257hq5iyx1w3yc85w7lmnb59gbvy")))) + (base32 "04ha4mysxvfz6yzbkgrl1mcwic1lwr1xx6gdy5rl6hn1wwnwam4p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-consult" ,emacs-consult) - ("notmuch" ,notmuch))) + ("emacs-notmuch" ,emacs-notmuch))) (home-page "https://codeberg.org/jao/consult-notmuch") (synopsis "Search and preview Notmuch emails using Consult") (description @@ -8451,7 +8478,7 @@ regexp that matches all known keywords.") (define-public emacs-perspective (package (name "emacs-perspective") - (version "2.16") + (version "2.17") (source (origin (method git-fetch) @@ -8460,7 +8487,7 @@ regexp that matches all known keywords.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hg4rj3v748f6k4fwa21g683vs3bfya0wg9r9xdg216kdhfdk5j7")))) + (base32 "1nmz39pcaa969g1966ykblzrz6lr3ddb0ip465y5in1fj498as6y")))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -9490,6 +9517,8 @@ queries using counsel.") `(("emacs-counsel" ,emacs-counsel) ("notmuch" ,notmuch) ("emacs-s" ,emacs-s))) + (propagated-inputs + `(("emacs-notmuch" ,emacs-notmuch))) (home-page "https://github.com/fuxialexander/counsel-notmuch") (synopsis "Search emails in Notmuch asynchronously with Ivy") (description @@ -9909,7 +9938,7 @@ features: (define-public emacs-typescript-mode (package (name "emacs-typescript-mode") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) (uri (git-reference @@ -9918,7 +9947,7 @@ features: (file-name (git-file-name name version)) (sha256 (base32 - "002f1xfhq43fjaqliwrgxspryfahpa82va5dw3p8kwil2xwvc6mh")))) + "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw")))) (build-system emacs-build-system) (home-page "https://github.com/ananthakumaran/typescript.el") (synopsis "Emacs major mode for editing Typescript code") @@ -10213,7 +10242,7 @@ with Elfeed.") (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "0.8.6") + (version "1.0.0") (source (origin (method git-fetch) @@ -10222,7 +10251,7 @@ with Elfeed.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9")))) + (base32 "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elfeed" ,emacs-elfeed))) @@ -10327,7 +10356,7 @@ maximizes flexibility (at the expense of conciseness).") (define-public emacs-find-file-in-project (package (name "emacs-find-file-in-project") - (version "6.1.1") + (version "6.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -10336,7 +10365,7 @@ maximizes flexibility (at the expense of conciseness).") (file-name (git-file-name name version)) (sha256 (base32 - "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c")))) + "00i62qspgmpg45gfzyq722wnni3yfmrkvlva8kmxdv5id919x1sc")))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -12865,7 +12894,7 @@ type an abbreviation and automatically expand it into function templates.") (define-public emacs-yasnippet-snippets (package (name "emacs-yasnippet-snippets") - (version "0.24") + (version "1.0") (source (origin (method git-fetch) @@ -12874,7 +12903,7 @@ type an abbreviation and automatically expand it into function templates.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y")))) + (base32 "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^snippets\\/" %default-include))) @@ -13630,7 +13659,7 @@ reached with the right hand.") (define-public emacs-csharp-mode (package (name "emacs-csharp-mode") - (version "0.12.0") + (version "1.0.2") (source (origin (method git-fetch) @@ -13639,7 +13668,7 @@ reached with the right hand.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x40xm9d5sbxbnyxl12ppkzlgxzyn0bjg2vmc139jpkazmmw7r7k")))) + (base32 "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g")))) (build-system emacs-build-system) (home-page "https://github.com/josteink/csharp-mode") (synopsis "Major mode for C# code") @@ -13648,8 +13677,7 @@ reached with the right hand.") syntax coloring, indentation, insertion of matched pairs of curly braces and documentation generation. In addition, it provides menu-based navigation using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") - ;; XXX: Project switched to GPL3+ after 0.10.0 release. - (license license:gpl2+))) + (license license:gpl3+))) (define-public emacs-php-mode (package @@ -13754,6 +13782,28 @@ containing words from the Rime project.") shuangpin, wubi and cangjie.") (license license:gpl2+))) +(define-public emacs-pinyinlib + (package + (name "emacs-pinyinlib") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cute-jumper/pinyinlib.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0")))) + (build-system emacs-build-system) + (home-page "https://github.com/cute-jumper/pinyinlib.el") + (synopsis "Convert first letter of Pinyin to Chinese characters") + (description + "This Emacs library provides functionality for converting the first +letter of Pinyin to Simplified/Traditional Chinese characters.") + (license license:gpl3+))) + (define-public emacs-reverse-im (package (name "emacs-reverse-im") @@ -15639,14 +15689,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "csv-mode-" version ".tar")) (sha256 - (base32 "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx")))) + (base32 "1i43b2p31xhrf97xbdi35y550ysp69fasa5gcrhg6iyxw176807p")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") @@ -15880,7 +15930,7 @@ Features: (define-public emacs-evil-matchit (package (name "emacs-evil-matchit") - (version "2.3.13") + (version "2.4.0") (source (origin (method git-fetch) @@ -15889,7 +15939,7 @@ Features: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk")))) + (base32 "1ls58wdjhs4q18bj3izflj0bb5fwafyr520y1j9kj29clqn73kxh")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) @@ -17401,7 +17451,7 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.5.2") + (version "0.6") (source (origin (method git-fetch) (uri (git-reference @@ -17409,7 +17459,7 @@ interactive commands and functions, such as @code{completing-read}.") (commit version))) (sha256 (base32 - "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx")) + "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs @@ -18075,28 +18125,32 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (license license:gpl3+))) (define-public emacs-crdt - (package - (name "emacs-crdt") - (version "0.1.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://code.librehq.com/qhong/crdt.el") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0455n75nan7abwnp7zfvrdbqmvlvfp0sf1ififr57h3sqsx3llhk")))) - (build-system emacs-build-system) - (home-page "https://code.librehq.com/qhong/crdt.el") - (synopsis "Real-time collaborative editing environment") - (description - "@code{crdt.el} is a real-time collaborative editing environment for + ;; XXX: Upstream does not always tag new releases. The commit below + ;; corresponds exactly to 0.2.5 bump. + (let ((commit "899674890b763a078ffeb0acc73c4bd5c7ad3479") + (version "0.2.5")) + (package + (name "emacs-crdt") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://code.librehq.com/qhong/crdt.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02irp9bafb1ph4wsbjqp4rh3w7zy0fkj4986d98g3jliqh5ijnvg")))) + (build-system emacs-build-system) + (home-page "https://code.librehq.com/qhong/crdt.el") + (synopsis "Real-time collaborative editing environment") + (description + "@code{crdt.el} is a real-time collaborative editing environment for Emacs using Conflict-free Replicated Data Types. With it, you can share multiple buffer in one session, and see other users’ cursor and region. It also synchronizes Org mode folding status. It should work with all of Org mode.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-crux (package @@ -20813,26 +20867,24 @@ See @code{helm-exwm-switch-browser} for an example.") (license license:gpl3+)))) (define-public emacs-helm-ls-git - (let ((commit "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed")) - (package - (name "emacs-helm-ls-git") - (version (git-version "1.9.1" "2" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-ls-git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc")))) - (build-system emacs-build-system) - (propagated-inputs `(("emacs-helm" ,emacs-helm))) - (home-page "https://github.com/emacs-helm/helm-ls-git") - (synopsis "Helm interface for listing the files in a Git repository") - (description - "This package provides a Helm interface for Git files. + (package + (name "emacs-helm-ls-git") + (version "1.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-ls-git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/emacs-helm/helm-ls-git") + (synopsis "Helm interface for listing the files in a Git repository") + (description + "This package provides a Helm interface for Git files. @itemize @item Display the open buffers in project. @item Display a status source showing state of project (modified files etc.). @@ -20847,7 +20899,7 @@ can use ack-grep instead of grep). projects unrelated to current-buffer. @item In addition, all actions of type files and buffers are provided. @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-helm-mu (let ((commit "77e6fea24e01481418738421dbcfe28ef1bd63cf")) @@ -21107,7 +21159,7 @@ server with @code{M-x pinentry-start}.") (define-public emacs-so-long (package (name "emacs-so-long") - (version "1.1") + (version "1.1.2") (source (origin (method git-fetch) @@ -21117,7 +21169,7 @@ server with @code{M-x pinentry-start}.") (file-name (git-file-name name version)) (sha256 (base32 - "1d886fgsbly7wpm6ppll45yq3y87a27wy5c6m0gqxq5jb4q0q7d2")))) + "06a76ajfqgz48yqvvyhi5b9zss9c6h4xz6acg98ibg0v99v9k5pz")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/SoLong") (synopsis "Improve performance in files with long lines") @@ -23489,29 +23541,27 @@ constant expressions.") (define-public emacs-docker (package (name "emacs-docker") - (version "1.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Silex/docker.el") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw")))) + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Silex/docker.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173")))) (inputs `(("emacs-undercover" ,emacs-undercover))) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-docker-tramp" ,emacs-docker-tramp) + ("emacs-json-mode" ,emacs-json-mode) ("emacs-magit-popup" ,emacs-magit-popup) ("emacs-s" ,emacs-s) ("emacs-tablist" ,emacs-tablist) - ("emacs-json-mode" ,emacs-json-mode))) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'check)))) ;no tests + ("emacs-transient" ,emacs-transient))) + (arguments `(#:tests? #false)) ;no tests (build-system emacs-build-system) (home-page "https://github.com/Silex/docker.el") (synopsis "Manage docker from Emacs") @@ -23659,7 +23709,7 @@ processes for Emacs") (define-public emacs-treemacs (package (name "emacs-treemacs") - (version "2.8") + (version "2.9") (source (origin (method git-fetch) (uri (git-reference @@ -23668,7 +23718,7 @@ processes for Emacs") (file-name (git-file-name name version)) (sha256 (base32 - "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2")))) + "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ace-window" ,emacs-ace-window) @@ -23685,6 +23735,7 @@ processes for Emacs") `(("python" ,python))) (arguments `(#:tests? #t + #:test-command '("make" "-C" "../.." "test") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-makefile @@ -23692,22 +23743,11 @@ processes for Emacs") (substitute* "Makefile" (("@\\$\\(CASK\\) exec ") "") ;; Guix does not need to prepare dependencies before testing. - (("test: prepare") "test:")) - #t)) + (("test: prepare") "test:")))) (add-after 'fix-makefile 'chdir-elisp ;; Elisp directory is not in root of the source. (lambda _ (chdir "src/elisp"))) - (replace 'check - ;; FIXME: Work around ‘treemacs--parse-collapsed-dirs’ and - ;; `treemacs-collect-child-nodes' test failures. - (lambda _ - (with-directory-excursion "../.." ;treemacs root - (chmod "test/test-treemacs.el" #o644) - (emacs-substitute-sexps "test/test-treemacs.el" - ("(describe \"treemacs--parse-collapsed-dirs\"" "") - ("\"Finds only direct childre\"" "")) - (invoke "make" "test")))) (add-before 'install 'patch-paths (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion "../.." ;treemacs root @@ -23724,18 +23764,16 @@ processes for Emacs") (string-append (assoc-ref inputs "python") "/bin/python3"))) (chmod "src/elisp/treemacs-async.el" #o644) (substitute* "src/elisp/treemacs-async.el" - (("src/scripts") (string-append "share/" ,name "/scripts")))) - #t)) + (("src/scripts") (string-append "share/" ,name "/scripts")))))) (add-after 'install 'install-data (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (with-directory-excursion "../.." ;treemacs root (copy-recursively "icons/default" - (string-append out "/share/" ,name "/images")) + (string-append out "/share/" ,name "/images")) (copy-recursively "src/scripts" - (string-append out "/share/" ,name "/scripts")) - #t))))))) + (string-append out "/share/" ,name "/scripts"))))))))) (home-page "https://github.com/Alexander-Miller/treemacs") (synopsis "Emacs tree style file explorer") (description @@ -23962,7 +24000,7 @@ workspaces with a LSP-compliant server running.") (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) - ("notmuch" ,notmuch))) + ("emacs-notmuch" ,emacs-notmuch))) (synopsis "Search emails with Emacs Notmuch and Helm") (description "This package can be used to search emails in Emacs, searching result @@ -23985,7 +24023,7 @@ real search.") "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q")))) (build-system emacs-build-system) (propagated-inputs - `(("notmuch" ,notmuch))) + `(("emacs-notmuch" ,emacs-notmuch))) (home-page "https://git.sr.ht/~tarsius/notmuch-maildir") (synopsis "Visualize maildirs as a tree") (description @@ -26610,7 +26648,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (define-public emacs-telega-server (package (name "emacs-telega-server") - (version "0.7.025") + (version "0.7.030") (source (origin (method git-fetch) @@ -26618,25 +26656,24 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit (string-append "v" version)))) (sha256 - (base32 "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc")) + (base32 "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" "emacs-telega-test-env.patch")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "INSTALL_PREFIX=" + (assoc-ref %outputs "out") "/bin")) + #:phases (modify-phases %standard-phases (add-before 'configure 'enter-subdirectory (lambda _ (chdir "server") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("CC=cc") ,(string-append "CC=" (cc-for-target))) - (("^(INSTALL_PREFIX=).*$" _all prefix) - (string-append prefix out "/bin\n"))) - (substitute* "run_tests.py" (("^(TELEGA_SERVER = ).*$" _all prefix) (string-append prefix @@ -26669,6 +26706,7 @@ service, and connect it with Emacs via inter-process communication.") emacs-minimal ;; Require wide-int support for 32-bit platform. emacs-wide-int) + #:include (cons "^etc\\/" %default-include) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -26696,24 +26734,8 @@ service, and connect it with Emacs via inter-process communication.") "/bin/telega-server"))) (substitute* "telega-util.el" (("@TELEGA_SHARE@") - (string-append (assoc-ref outputs "out") - "/share/emacs-telega"))))) - (add-after 'install 'install-share-files - (lambda* (#:key outputs #:allow-other-keys) - (define install-plan - '("langs" "sounds" "emojis.alist" - "verified.svg" "telega-logo.svg")) - - (define prefix (string-append (assoc-ref outputs "out") - "/share/emacs-telega")) - (with-directory-excursion "etc" - (for-each (lambda (file) - (if (file-is-directory? file) - (let ((dest (string-append prefix "/" file))) - (copy-recursively file dest)) - (install-file file prefix))) - install-plan)) - #t))))) + (string-append (elpa-directory (assoc-ref outputs "out")) + "/etc")))))))) (inputs `(("emacs-telega-server" ,emacs-telega-server) ("ffmpeg" ,ffmpeg))) @@ -27080,14 +27102,14 @@ interface.") (define-public emacs-ivy-posframe (package (name "emacs-ivy-posframe") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ivy-posframe-" version ".tar")) (sha256 - (base32 "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23")))) + (base32 "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy) @@ -29059,7 +29081,7 @@ s-expression.") (define-public emacs-map (package (name "emacs-map") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) @@ -29067,7 +29089,7 @@ s-expression.") version ".tar")) (sha256 (base32 - "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx")))) + "1ikgrwzzdz77qbflsccd63w8l4zs5zx9iarxn33kgx2dqrq2dmc6")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/map.html") (synopsis "Map manipulation functions") |