From 39d8e11c13a76612a97100cd0da898521fc34a2d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 23 Jun 2021 22:12:46 +0200 Subject: gnu: emacs-consult: Update to 0.9. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 0.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 28b87d49dd..2f9989cdc9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8007,7 +8007,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.8") + (version "0.9") (source (origin (method git-fetch) @@ -8015,7 +8015,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "1460818fb6y086vgn1mzmrwhpa5jswlwi4v71zr86cg6y7yg4248")) + (base32 "0iy6lrqbpi4lv7141rdawpn278rxinfxspwb81n04azyxrk28vlw")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs -- cgit v1.2.3 From 27302fd88002f2c6453faccf912745cbc06f44fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 24 Jun 2021 14:36:24 +0300 Subject: gnu: emacs-packed: Add source file-name. * gnu/packages/emacs-xyz.scm (emacs-packed)[source]: Add file-name field. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2f9989cdc9..1f10764c86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich ;;; Copyright © 2015, 2016, 2018, 2020 Christopher Lemmer Webber ;;; Copyright © 2016 Adriano Peluso -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016, 2017 Roel Janssen @@ -20495,6 +20495,7 @@ file.") (uri (git-reference (url "https://github.com/emacscollective/packed") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "06blk8parnpq3qi6y5628q3v59c8dyi41glb289a0l16248qwphk")))) -- cgit v1.2.3 From 81ab5377c58ca6f7a24d23929397f4936398c0bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 24 Jun 2021 15:46:50 +0200 Subject: gnu: emacs-leaf: Update to 4.5.2. * gnu/packages/emacs-xyz.scm (emacs-leaf): Update to 4.5.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f10764c86..0b28219cb3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13022,14 +13022,14 @@ performance-oriented and tidy.") (define-public emacs-leaf (package (name "emacs-leaf") - (version "4.4.8") + (version "4.5.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "leaf-" version ".tar")) (sha256 - (base32 "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3")))) + (base32 "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54")))) (build-system emacs-build-system) (home-page "https://github.com/conao3/leaf.el") (synopsis "Simplify your init.el configuration, extended use-package") -- cgit v1.2.3 From 0c432277f243426e65804651dcef91686d7c97ab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 24 Jun 2021 15:47:00 +0200 Subject: gnu: emacs-pyim: Update to 3.8.2. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.8.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0b28219cb3..b84c0d6622 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13353,13 +13353,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "3.8.1") + (version "3.8.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "19rsy41l588aijyi81jmqz9icl8r7ifh46yyl2dl99qz5rw00hlp")))) + (base32 "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From da5045e1c92c3cf1e931f41b78d77695ea6074a8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 25 Jun 2021 08:12:31 +0200 Subject: gnu: emacs-helm: Update to 3.8.0. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.8.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b84c0d6622..7e83fa579a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10559,7 +10559,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.7.1") + (version "3.8.0") (source (origin (method git-fetch) @@ -10568,7 +10568,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h")))) + (base32 "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 36a17248cefce04338d4bca14e62445f7f4f7d06 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 25 Jun 2021 08:18:53 +0200 Subject: gnu: emacs-helm: Make description more focused. * gnu/packages/emacs-xyz.scm (emacs-helm)[description]: Shorten and keep it focused on Helm, not Anything. --- gnu/packages/emacs-xyz.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7e83fa579a..40718373b5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10574,15 +10574,12 @@ ack, ag, helm and pt.") `(("emacs-async" ,emacs-async) ("emacs-popup" ,emacs-popup))) (home-page "https://emacs-helm.github.io/helm/") - (synopsis "Incremental completion and selection narrowing -framework for Emacs") - (description "Helm is incremental completion and selection narrowing -framework for Emacs. It will help steer you in the right direction when -you're looking for stuff in Emacs (like buffers, files, etc). Helm is a fork -of @code{anything.el} originally written by Tamas Patrovic and can be -considered to be its successor. Helm sets out to clean up the legacy code in -@code{anything.el} and provide a cleaner, leaner and more modular tool, that's -not tied in the trap of backward compatibility.") + (synopsis + "Incremental completion and selection narrowing framework for Emacs") + (description + "Helm is an incremental completion and selection narrowing framework for +Emacs. It will help steer you in the right direction when you're looking for +stuff in Emacs (like buffers, files, etc).") (license license:gpl3+))) (define-public emacs-helm-org -- cgit v1.2.3 From 91ea14b9156e7853b2b2f0b6ecece69f83b3b3b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 25 Jun 2021 08:25:19 +0200 Subject: gnu: emacs-package-build: Update to 2.4. * gnu/packages/emacs-xyz.scm (emacs-package-build): Update to 2.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 40718373b5..6526106e13 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -535,7 +535,7 @@ buffers, directory trees, or the web.") (define-public emacs-package-build (package (name "emacs-package-build") - (version "2.3") + (version "2.4") (source (origin (method git-fetch) (uri (git-reference @@ -544,7 +544,7 @@ buffers, directory trees, or the web.") (file-name (git-file-name name version)) (sha256 (base32 - "1412pjghyvzkdlsrrs0ql30vw591bhyk1wlbf49f15dzjbspx3w0")))) + "1lm5mgvjhpxqfw5gcv99h4mwbq728b6f2hj5vjh1j67kdwy7ws8k")))) (build-system emacs-build-system) (home-page "https://github.com/melpa/package-build") (synopsis "Tools for assembling en Emacs package archive") -- cgit v1.2.3 From 30cf737327ce6ec3bd95bdd19f5b69c254bf03d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 26 Jun 2021 09:50:51 +0200 Subject: gnu: emacs-libmpdel: Update to 1.3.0. * gnu/packages/emacs-xyz.scm (emacs-libmpdel): Update to 1.3.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6526106e13..9aadb80e46 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22418,7 +22418,7 @@ comments.") (define-public emacs-libmpdel (package (name "emacs-libmpdel") - (version "1.2.0") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -22427,7 +22427,7 @@ comments.") (file-name (git-file-name name version)) (sha256 (base32 - "1nzs6g2mg3jhfhhfcxjhd9sbvwzhmr6j6mc80ln2nr4gzjqgaa4k")))) + "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9")))) (build-system emacs-build-system) (home-page "https://gitea.petton.fr/mpdel/libmpdel") (synopsis "Emacs library to communicate with Music Player Daemon (MPD)") -- cgit v1.2.3 From 4a9c947614247c79835da1c90ebbe8fadff53d01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 26 Jun 2021 09:53:21 +0200 Subject: gnu: libmpdel: Use complete sentences in description. * gnu/packages/emacs-xyz.scm (emacs-libmpdel)[description]: Use complete sentences. --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9aadb80e46..4e18edf782 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22432,8 +22432,9 @@ comments.") (home-page "https://gitea.petton.fr/mpdel/libmpdel") (synopsis "Emacs library to communicate with Music Player Daemon (MPD)") (description - "An Emacs library client to communicate with Music Player Daemon (MPD), a -flexible, powerful, server-side application for playing music.") + "LibMPDel is an Emacs library client to communicate with Music Player +Daemon (MPD), a flexible, powerful, server-side application for playing +music.") (license license:gpl3+))) (define-public emacs-mpdel -- cgit v1.2.3 From 7c318c420141ef7109ac82005bc221df2fe00833 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 26 Jun 2021 09:56:08 +0200 Subject: gnu: emacs-rg: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-rg): Update to 2.1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4e18edf782..b562257bf3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4407,7 +4407,7 @@ result.") (define-public emacs-rg (package (name "emacs-rg") - (version "2.0.3") + (version "2.1.0") (source (origin (method git-fetch) @@ -4416,7 +4416,7 @@ result.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr")))) + (base32 "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit v1.2.3 From e8a0d0b2093d749b7cb457f91cad849009bca63e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 26 Jun 2021 10:18:09 +0200 Subject: gnu: emacs-circe: Update to 2.11-0.d6f1fa1. * gnu/packages/emacs-xyz.scm (emacs-circe): Update to 2.11-0.d6f1fa1. [arguments]<#:phases>: Remove three failing tests. --- gnu/packages/emacs-xyz.scm | 86 ++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 34 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b562257bf3..ab04992fad 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15018,43 +15018,61 @@ part, which includes creating tokens.") (license license:asl2.0))) (define-public emacs-circe - (package - (name "emacs-circe") - (version "2.11") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jorgenschaefer/circe") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("buttercup" "-L" ".") - #:phases - (modify-phases %standard-phases - ;; The HOME environment variable should be set to an existing - ;; directory for the tests to succeed. - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp") - #t))))) - (native-inputs - `(("emacs-buttercup" ,emacs-buttercup))) - ;; In order to securely connect to an IRC server using TLS, Circe requires - ;; the GnuTLS binary. - (propagated-inputs - `(("gnutls" ,gnutls))) - (home-page "https://github.com/jorgenschaefer/circe") - (synopsis "Client for IRC in Emacs") - (description "Circe is a Client for IRC in Emacs. It integrates well with + ;; The latest stable release is two years old, and some important fixes have + ;; landed since then. + (let ((commit "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19") + (revision "0")) + (package + (name "emacs-circe") + (version (git-version "2.11" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/circe") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-L" ".") + #:emacs ,emacs ;requires gnutls + #:phases + (modify-phases %standard-phases + ;; The HOME environment variable should be set to an existing + ;; directory for the tests to succeed. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp"))) + (add-before 'check 'remove-failing-tests + (lambda _ + (make-file-writable "tests/test-circe.el") + (emacs-batch-edit-file "tests/test-circe.el" + `(progn + (dolist (test + '("should have circe-server-buffer set in the mode hook" + "should complete nicks with colon at the beginning of the input" + "should complete nicks without colon later in the input")) + (goto-char (point-min)) + (search-forward (format "(it %S" test)) + (beginning-of-line) + (kill-sexp)) + (basic-save-buffer)))))))) + (native-inputs + `(("emacs-buttercup" ,emacs-buttercup))) + ;; In order to securely connect to an IRC server using TLS, Circe requires + ;; the GnuTLS binary. + (propagated-inputs + `(("gnutls" ,gnutls))) + (home-page "https://github.com/jorgenschaefer/circe") + (synopsis "Client for IRC in Emacs") + (description "Circe is a Client for IRC in Emacs. It integrates well with the rest of the editor, using standard Emacs key bindings and indicating activity in channels in the status bar so it stays out of your way unless you want to use it.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-tracking (package -- cgit v1.2.3 From 3a8067b009816d1c325b975b0ee4a43d0a904f24 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 30 Jun 2021 00:12:35 +0200 Subject: gnu: emacs-tramp: Update to 2.5.1. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab04992fad..ce1506424e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24588,14 +24588,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.0.5") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0")))) + (base32 "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From d0aadf86ef884143d75d7ec265d3042de7753e98 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 30 Jun 2021 00:12:50 +0200 Subject: gnu: emacs-ebdb: Update to 0.6.24. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.6.24. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ce1506424e..5c141c5203 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25344,14 +25344,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.6.23") + (version "0.6.24") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld")))) + (base32 "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit v1.2.3 From 8269d828688dcd5a089a0117764930e82e52ea97 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 30 Jun 2021 00:35:56 +0200 Subject: gnu: emacs-rime: Update to 1.0.5. * gnu/packages/emacs-xyz.scm (emacs-rime): Update to 1.0.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5c141c5203..d8c1f86207 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26402,7 +26402,7 @@ REPL appropriate to the current major mode.") (define-public emacs-rime (package (name "emacs-rime") - (version "1.0.4") + (version "1.0.5") (source (origin (method git-fetch) @@ -26411,7 +26411,7 @@ REPL appropriate to the current major mode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9")))) + (base32 "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237")))) (build-system emacs-build-system) (arguments '(#:include (cons "\\.so$" %default-include) -- cgit v1.2.3 From 94821e11d18deb116d48a61c66c68400552ccce0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 1 Jul 2021 10:10:09 +0200 Subject: gnu: emacs-window-purpose: Update to 1.8.1. * gnu/packages/emacs-xyz.scm (emacs-window-purpose): Update to 1.8.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d8c1f86207..9a143d39cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8806,7 +8806,7 @@ possible, and falls back to moving the left or top border otherwise.") (define-public emacs-window-purpose (package (name "emacs-window-purpose") - (version "1.8") + (version "1.8.1") (source (origin (method git-fetch) @@ -8816,7 +8816,7 @@ possible, and falls back to moving the left or top border otherwise.") (file-name (git-file-name name version)) (sha256 (base32 - "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq")))) + "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-let-alist" ,emacs-let-alist) -- cgit v1.2.3 From 4920d4965e0c4680cae1f5c5363d07b108f79f3b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 1 Jul 2021 11:24:17 +0300 Subject: gnu: emacs-pdf-tools: Update to new repo and revision. * gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Update. [source]: Change URL to for. See . This update is required to make pdf-tools work properly for HiDPI screens. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9a143d39cc..5426c76c23 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3259,8 +3259,8 @@ during idle time, while Emacs is doing nothing else.") (define-public emacs-pdf-tools ;; XXX: Development branch fixes an incompatibility with Emacs 27+. See ;; . - (let ((commit "c510442ab89c8a9e9881230eeb364f4663f59e76") - (revision "1")) + (let ((commit "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7") + (revision "2")) (package (name "emacs-pdf-tools") (version (git-version "0.90" revision commit)) @@ -3268,11 +3268,11 @@ during idle time, while Emacs is doing nothing else.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/politza/pdf-tools") + (url "https://github.com/vedang/pdf-tools") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "17z3cpn76g9dp62drjrgrqpp1bgf4gl5k5gspylskpvd4kj4bq4d")))) + (base32 "0hzqcnxi66d0c3dq7y3dn28f3yri4zcx46yylhy0xnm3f1yja0rm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 050ec2390f3e1d55aab57f8f01b73fbb6e932683 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi via Guix-patches via Date: Tue, 29 Jun 2021 18:59:35 +0530 Subject: gnu: Add emacs-rustic. * gnu/packages/emacs-xyz.scm (emacs-rustic): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5426c76c23..a38681ebcb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -99,6 +99,7 @@ ;;; Copyright © 2021 Eugene Klimov ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 David Dashyan +;;; Copyright © 2021 Dhruvin Gandhi ;;; ;;; This file is part of GNU Guix. ;;; @@ -21039,6 +21040,62 @@ source code.") (license (list license:expat license:asl2.0)))) +(define-public emacs-rustic + ;; XXX: Upstream does not tag releases. Version is extracted from main + ;; file. + (let ((commit "bbf129cd128105de51b6c242b2551094b8d8987d") + (revision "0")) + (package + (name "emacs-rustic") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brotzeit/rustic") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09dnlvi8kf683n6q3yp4gy9d4idiyg4x6rcij8d90cvygh8i30wd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-markdown-mode" ,emacs-markdown-mode) + ("emacs-project" ,emacs-project) + ("emacs-s" ,emacs-s) + ("emacs-spinner" ,emacs-spinner) + ("emacs-xterm-color" ,emacs-xterm-color))) + (arguments + ;; Tests require rust, cargo, rustfmt, and various crates to be + ;; vendored. + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-without-cask + (lambda _ + (setenv "WITHOUT_CASK" "1")))))) + (home-page "https://github.com/brotzeit/rustic") + (synopsis "Rust development environment for Emacs") + (description "Rustic is a fork of Rust mode. +In addition to its predecessor, it offers the following features: +@itemize +@item Flycheck integration, +@item Cargo popup, +@item multiline error parsing, +@item translation of ANSI control sequences through XTerm color, +@item asynchronous Org Babel, +@item custom compilation process, +@item @command{rustfmt} errors in a Rust compilation mode, +@item automatic LSP configuration with Eglot or LSP mode, +@item optional Rust inline documentation, +@item etc. +@end itemize") + (license (list license:expat + license:asl2.0))))) + (define-public emacs-ztree ;; Upstream provides no tag, but the commit below matches latest release. (let ((commit "c9ad9136d52ca5a81475693864e255d29448f43f")) -- cgit v1.2.3 From bd70425a713acdeb76a0b033f5d58c3a06b247ea Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Fri, 2 Jul 2021 09:21:22 +0200 Subject: gnu: Add emacs-ripgrep. * gnu/packages/emacs-xyz.scm (emacs-ripgrep): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a38681ebcb..0556f79035 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4405,6 +4405,36 @@ column by drawing a thin line down the length of the editing window.") result.") (license license:gpl3+))) +(define-public emacs-ripgrep + (package + (name "emacs-ripgrep") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nlamirault/ripgrep.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The repository contains both ripgrep and projectile-ripgrep + ;; packages. The latter has been merged into projectile itself. + (add-after 'unpack 'delete-projectile-ripgrep + (lambda _ + (delete-file "projectile-ripgrep.el")))))) + (propagated-inputs + `(("ripgrep" ,ripgrep))) + (home-page "https://github.com/nlamirault/ripgrep.el") + (synopsis "Search using ripgrep from inside Emacs") + (description "@code{ripgrep} is an Emacs search package based on the +@command{ripgrep} command line tool.") + (license license:gpl2+))) + (define-public emacs-rg (package (name "emacs-rg") -- cgit v1.2.3 From 168992a732afec7692a26be4cc17195c7e2de443 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Thu, 1 Jul 2021 10:37:32 +0000 Subject: gnu: emacs-link-hint: Update to 0.1-2.ae73db6. * gnu/packages/emacs-xyz.scm (emacs-link-hint): Update to 0.1-2.ae73db6. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0556f79035..cc761dcb5f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2453,8 +2453,8 @@ configuration language. It features: (define-public emacs-link-hint ;; Last release was in 2015. - (let ((commit "d74a483652486260c052941fedeadddb1ea71f88") - (revision "1")) + (let ((commit "ae73db6a5948c8d109fc1d570760bcafa3f07175") + (revision "2")) (package (name "emacs-link-hint") (version (git-version "0.1" revision commit)) @@ -2467,7 +2467,7 @@ configuration language. It features: (file-name (git-file-name name version)) (sha256 (base32 - "0dghxd165fbds6czy9bfwpid3i4irgp3q08n9mg57sfifi0cmij0")))) + "1rlbxlh9a0hnlaxpgfjvjjvmhnzwc84p9xiqi740xv82cd27wcnl")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-avy" ,emacs-avy))) -- cgit v1.2.3 From 21706e1e0a57a6edc90088b55d43cddbc030ce7b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 1 Jul 2021 17:55:40 +0300 Subject: gnu: Add emacs-saveplace-pdf-view. * gnu/packages/emacs-xyz.scm (emacs-saveplace-pdf-view): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cc761dcb5f..ac69f9fb4a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3339,6 +3339,30 @@ e.g. ghostscript and stored in the file-system, but rather created on-demand and stored in memory.") (license license:gpl3+)))) +(define-public emacs-saveplace-pdf-view + (package + (name "emacs-saveplace-pdf-view") + (version "1.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicolaisingh/saveplace-pdf-view") + (commit (string-append "saveplace-pdf-view-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i03qb6qc2agp9s5s7l08f1wl8anqndh6xshg1c3w357vd1whv7i")))) + (build-system emacs-build-system) + (home-page "https://github.com/nicolaisingh/saveplace-pdf-view") + (synopsis "Save place in pdf-view buffers for Emacs") + (description + "This package extends the built-in Save-Place mode by adding support for +PDF view (see @code{emacs-pdf-tools}). This package will store the +place (e.g., the current page and zoom) of PDF buffers under PDFView mode or +DocView mode, and revisiting those PDF files later using the same mode will +restore the saved place.") + (license license:gpl3+))) + (define-public emacs-dash (package (name "emacs-dash") -- cgit v1.2.3 From e8b7993417db9b3e99ada0e651268062193b387d Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Thu, 1 Jul 2021 22:27:24 +0000 Subject: gnu: emacs-multitran: Update to 0.4.11. * gnu/packages/emacs-xyz.scm (emacs-multitran): Update to 0.4.11. [description]: Add @url markup. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ac69f9fb4a..f122bc46da 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28755,7 +28755,7 @@ shorter than usual, using mostly unprefixed keys.") (define-public emacs-multitran (package (name "emacs-multitran") - (version "0.4.10") + (version "0.4.11") (source (origin (method git-fetch) @@ -28764,13 +28764,13 @@ shorter than usual, using mostly unprefixed keys.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08b9a0pb38swgvg2v97pm4g2zda0xagdgq42znwhkmhzjiskh2g1")))) - (build-system emacs-build-system) - (home-page "https://github.com/zevlg/multitran.el") - (synopsis "Emacs interface to the multitran.com online dictionary") - (description "@code{emacs-multitran} is a zero-dependency Emacs interface -to the https://multitran.com online dictionary.") - (license license:gpl3+))) + (base32 "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx")))) + (build-system emacs-build-system) + (home-page "https://github.com/zevlg/multitran.el") + (synopsis "Emacs interface to the multitran.com online dictionary") + (description "@code{emacs-multitran} is a zero-dependency Emacs interface +to the @url{https://multitran.com} online dictionary.") + (license license:gpl3+))) (define-public emacs-kibit-helper (package -- cgit v1.2.3 From ddbfc21f76a0d9d6576c9367fa1b07ca9842a9a9 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Thu, 1 Jul 2021 19:57:04 +0000 Subject: gnu: Add emacs-rmsbolt. * gnu/packages/emacs-xyz.scm (emacs-rmsbolt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f122bc46da..5f1469e9ea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8433,6 +8433,31 @@ sources. Unlike GUD, it also supports running multiple debug sessions in parallel.") (license license:gpl3+))) +(define-public emacs-rmsbolt + ;; There is no release tag. Version is extracted from main file. + (let ((commit "ff496660cc52a6dd33d358ef0acc6d4bb70cc340") + (revision "0") + (version "0.1.2")) + (package + (name "emacs-rmsbolt") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgkamat/rmsbolt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05i0101238yy1da6z543nr9x5gpvgdxrrdn3sw5dibcn6z62ml3p")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/jgkamat/rmsbolt") + (synopsis "Emacs viewer for compiler output") + (description + "RMSBolt is a package to provide assembly or bytecode output for +a source code input file.") + (license license:agpl3+)))) + (define-public emacs-request ;; We prefer a more recent commit that has support for auth-source, ;; which makes authentication more convenient for users and maintainers. -- cgit v1.2.3 From aa93197e15daf900d2e276bd6072a69d05375414 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Fri, 2 Jul 2021 04:15:37 -0700 Subject: gnu: emacs-magit: Update to 3.1.1. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.1.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5f1469e9ea..4bc1cd4b86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -100,6 +100,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 David Dashyan ;;; Copyright © 2021 Dhruvin Gandhi +;;; Copyright © 2021 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -731,7 +732,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (define-public emacs-magit (package (name "emacs-magit") - (version "3.0.0") + (version "3.1.1") (source (origin (method git-fetch) @@ -740,7 +741,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m")))) + (base32 "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs-no-x ;module support is required -- cgit v1.2.3 From 854e28e0b8e6d7d25e65fde2a7976f8f771bbc94 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 3 Jul 2021 09:35:33 -0400 Subject: gnu: Add emacs-muse. * gnu/packages/emacs-xyz.scm (emacs-muse): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bc1cd4b86..2dd51eb0d4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13516,6 +13516,26 @@ with CJK languages.") to org file, you can use this tool to write orgify commentary.") (license license:gpl2+))) +(define-public emacs-muse + (package + (name "emacs-muse") + (version "3.20.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "muse-" version ".tar")) + (sha256 + (base32 "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn")))) + (build-system emacs-build-system) + (home-page "https://www.gnu.org/software/emacs-muse") + (synopsis "Authoring and publishing environment for Emacs") + (description + "Emacs Muse (also known as Muse) is an authoring and publishing +environment for Emacs. It simplifies the process of writing documents and +publishing them to various output formats such as HTML, LaTeX, or PDF.") + (license license:gpl3+))) + (define-public emacs-mustache (package (name "emacs-mustache") -- cgit v1.2.3 From 4e3479c229fc84f162ad784f2353dadfb9f397f0 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Sat, 3 Jul 2021 18:25:13 +0000 Subject: gnu: Add emacs-seriestracker. * gnu/packages/emacs-xyz.scm (emacs-seriestracker): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2dd51eb0d4..31fa8a03f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28603,6 +28603,34 @@ between cursor and next word, parenthesis or delimiter while honoring some rules about where space should be left to separate words and parentheses.") (license license:gpl2+)))) +(define-public emacs-seriestracker + (package + (name "emacs-seriestracker") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MaximeWack/seriesTracker") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b9hf20iah3ym2d4kz67k0kb48dq0442zxw4zmc03zg3sxfdxh0x")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-transient" ,emacs-transient))) + (home-page "https://github.com/MaximeWack/seriesTracker") + (synopsis "Keep track of the TV shows you watch from Emacs") + (description + "This package provides a major mode for tracking TV shows. +TV shows data (episode list, release dates, etc.) are sourced from +the free database hosted at @url{episodate.com}. The mode presents an +outlined list of tracked shows, their episodes and release dates, and +enables the user to see when new episodes for their favorite shows get +released, and track their progress in watching a series.") + (license license:gpl3+))) + (define-public emacs-webpaste (package (name "emacs-webpaste") -- cgit v1.2.3 From 9eebe608915080cee1300a6b78dcf6c97efa57de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 4 Jul 2021 08:52:08 +0200 Subject: gnu: emacs-spinner: Update to 1.7.4. * gnu/packages/emacs-xyz.scm (emacs-spinner): Update to 1.7.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31fa8a03f1..33a6ffd072 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9389,14 +9389,14 @@ languages.") (define-public emacs-spinner (package (name "emacs-spinner") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/spinner-" version ".el")) (sha256 (base32 - "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd")))) + "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv")))) (build-system emacs-build-system) (home-page "https://github.com/Malabarba/spinner.el") (synopsis "Emacs mode-line spinner for operations in progress") -- cgit v1.2.3 From a1af5e2f726ac64f506680efe189c21ac4fa6bb0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 4 Jul 2021 14:42:14 +0200 Subject: gnu: emacs-spinner: Fix source URL. * gnu/packages/emacs-xyz.scm (emacs-spinner)[source]: Fix URL. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 33a6ffd072..3ffb9d38c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9393,10 +9393,9 @@ languages.") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/spinner-" - version ".el")) + version ".tar")) (sha256 - (base32 - "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv")))) + (base32 "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv")))) (build-system emacs-build-system) (home-page "https://github.com/Malabarba/spinner.el") (synopsis "Emacs mode-line spinner for operations in progress") -- cgit v1.2.3 From a8d1469f9a4b4612fde6473bb576a4bd891ba2ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 5 Jul 2021 08:46:51 +0200 Subject: gnu: emacs-pyim: Update to 3.8.3. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.8.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3ffb9d38c3..d96d2081e7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13430,13 +13430,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "3.8.2") + (version "3.8.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw")))) + (base32 "1sjb1al1d1xsqnflcxkm1bb419kclc30a4f7dbhzha90hd8cry4p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From e5a84776127f36d66df3f298cf6b76c9f449dc45 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 5 Jul 2021 08:46:58 +0200 Subject: gnu: emacs-slime-volleyball: Update to 1.2.0. * gnu/packages/emacs-xyz.scm (emacs-slime-volleyball): Update to 1.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d96d2081e7..9084083ebe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25632,14 +25632,14 @@ JIRA issue servers.") (define-public emacs-slime-volleyball (package (name "emacs-slime-volleyball") - (version "1.1.7") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "slime-volleyball-" version ".tar")) (sha256 - (base32 "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy")))) + (base32 "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.svg$" "\\.b64$" "slime\\.el\\.gz$"))) (home-page "http://elpa.gnu.org/packages/slime-volleyball.html") -- cgit v1.2.3 From 220c8dc25b26bef2d5d0e049d2d151a52c3f181d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 4 Jul 2021 12:40:17 +0200 Subject: gnu: emacs-transient: Update to 0.3.6. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.3.6. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9084083ebe..9591a4e6e7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23596,7 +23596,7 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.3.5") + (version "0.3.6") (source (origin (method git-fetch) (uri (git-reference @@ -23605,7 +23605,7 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "0wzfnzv2304a737zwp163aajjhm8i3ix9v7palgg1r3jskvbghmw")))) + "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite -- cgit v1.2.3 From 30c6b6ccb4c4efe1f858eca3e0fd2b7a6b6bf06b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 7 Jul 2021 22:53:54 +0200 Subject: gnu: emacs-pyim: Update to 3.9.0. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.9.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9591a4e6e7..f5f989f09e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13430,13 +13430,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "3.8.3") + (version "3.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "1sjb1al1d1xsqnflcxkm1bb419kclc30a4f7dbhzha90hd8cry4p")))) + (base32 "1rpmw2x9gqwaw96086bfx8vkvxnw03wnclq7psi8zjb6ayz3p2qj")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 08f03de158490799e1cbda3cf364ccb848951537 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Wed, 7 Jul 2021 16:56:24 -0700 Subject: gnu: emacs-deadgrep: Add missing input. * gnu/packages/emacs-xyz.scm (emacs-deadgrep)[inputs]: Add ripgrep. [arguments]: Add configure phase to set deadgrep-executable to absolute path. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f5f989f09e..530eb90dcc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20802,10 +20802,24 @@ accept and reject GitHub pull requests.") (base32 "1vjhrq02l8gvdn2haygzq7277hnhjchs9xrfpcnh76gqip200gx4")))) (build-system emacs-build-system) + (inputs `(("ripgrep" ,ripgrep))) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) ("emacs-spinner" ,emacs-spinner))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((ripgrep (assoc-ref inputs "ripgrep"))) + ;; .el is read-only in git. + (make-file-writable "deadgrep.el") + ;; Specify the absolute file names of rg so that everything + ;; works out-of-the-box. + (emacs-substitute-variables "deadgrep.el" + ("deadgrep-executable" + (string-append ripgrep "/bin/rg"))))))))) (home-page "https://github.com/Wilfred/deadgrep") (synopsis "Frontend for @code{ripgrep}") (description "This package provides an Emacs interface for performing -- cgit v1.2.3 From 9381f1fa4aa5ba78d6fa5f5c6f5262d71c4f5199 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 7 Jul 2021 17:12:47 +0300 Subject: gnu: Add emacs-consult-notmuch. * gnu/packages/emacs-xyz.scm (emacs-consult-notmuch): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 530eb90dcc..cee6b0f9e9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8084,6 +8084,30 @@ Emacs completion function completing-read, which allows quickly selecting from a list of candidates.") (license license:gpl3+))) +(define-public emacs-consult-notmuch + (package + (name "emacs-consult-notmuch") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/jao/consult-notmuch") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-consult" ,emacs-consult) + ("notmuch" ,notmuch))) + (home-page "https://codeberg.org/jao/consult-notmuch") + (synopsis "Search and preview Notmuch emails using Consult") + (description + "This package provides two commands using consult to query Notmuch emails +and present results either as single emails or full trees.") + (license license:gpl3+))) + (define-public emacs-marginalia (package (name "emacs-marginalia") -- cgit v1.2.3 From 2a1fde403d5d47c730537be7c079415bc40d4e79 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 8 Jul 2021 15:32:40 +0200 Subject: gnu: emacs-chronometrist: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): Update to 0.9.0. [source]: Update upstream URL. [inputs]: Add emacs-spark. Remove emacs-anaphora and emacs-literate-elisp. --- gnu/packages/emacs-xyz.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cee6b0f9e9..e4ef3884e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2729,16 +2729,16 @@ Lock key.") (define-public emacs-chronometrist (package (name "emacs-chronometrist") - (version "0.7.0") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/contrapunctus-1/chronometrist") + (url "https://tildegit.org/contrapunctus/chronometrist") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s483ca4f8192gr9ix9jxjfcmxp30b7qk2jiaqzprkrn9kcgw544")))) + (base32 "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k")))) (build-system emacs-build-system) (arguments `(#:phases @@ -2746,8 +2746,7 @@ Lock key.") (add-after 'unpack 'chdir-elisp ;; Elisp directory is not in root of the source. (lambda _ - (chdir "elisp") - #t)) + (chdir "elisp"))) (add-after 'install 'install-doc ;; Documentation consists of several Markdown files. (lambda* (#:key outputs #:allow-other-keys) @@ -2762,10 +2761,9 @@ Lock key.") (find-files "." "\\.md$"))))) #t))))) (propagated-inputs - `(("emacs-anaphora" ,emacs-anaphora) - ("emacs-dash" ,emacs-dash) - ("emacs-literate-elisp" ,emacs-literate-elisp) + `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) + ("emacs-spark" ,emacs-spark) ("emacs-ts" ,emacs-ts))) (home-page "https://github.com/contrapunctus-1/chronometrist") (synopsis "Time tracker for Emacs") -- cgit v1.2.3 From d0ccdd707d42e978eeeb55612398c92889e3ebb1 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:25:05 +0800 Subject: gnu: Add emacs-telega-server. * gnu/packages/emacs-xyz.scm (emacs-telega-server): New variable. * gnu/packages/patches/emacs-telega-path-placeholder.patch: New file. * gnu/package/patches/emacs-telega-patch-server-functions.patch: Remove stale patch. * gnu/local.mk (dist_patch_DATA): Update accordingly. Signed-off-by: Leo Prikler --- gnu/local.mk | 2 +- gnu/packages/emacs-xyz.scm | 55 +++++++++++++++++++++- .../emacs-telega-patch-server-functions.patch | 31 ------------ .../patches/emacs-telega-path-placeholder.patch | 44 +++++++++++++++++ 4 files changed, 99 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/emacs-telega-patch-server-functions.patch create mode 100644 gnu/packages/patches/emacs-telega-path-placeholder.patch (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1504490c94..e5eebef7c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -988,7 +988,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ - %D%/packages/patches/emacs-telega-patch-server-functions.patch \ + %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/enjarify-setup-py.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e4ef3884e8..1a749a05e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -81,7 +81,7 @@ ;;; Copyright © 2020, 2021 Niklas Eklund ;;; Copyright © 2020 Marco Grassi ;;; Copyright © 2020 Tomás Ortín Fernández -;;; Copyright © 2020 Zhu Zihao +;;; Copyright © 2020, 2021 Zhu Zihao ;;; Copyright © 2020 Adam Kandur ;;; Copyright © 2020 Tim Howes ;;; Copyright © 2020 Noah Landis @@ -146,6 +146,7 @@ #:use-module (gnu packages djvu) #:use-module (gnu packages ebook) #:use-module (gnu packages emacs) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) @@ -26219,6 +26220,58 @@ fish-completion. It can be used in both Eshell and M-x shell.") other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) +(define-public emacs-telega-server + (package + (name "emacs-telega-server") + (version "0.7.024") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/telega.el") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j")) + (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 + (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 + "\"" out "/bin/telega-server\"\n")))))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..") #t))) + #:test-target "test")) + (inputs + `(("tdlib" ,tdlib) + ("libappindicator" ,libappindicator))) + (native-inputs + `(("python" ,python) + ("pkg-config" ,pkg-config))) + (home-page "https://zevlg.github.io/telega.el/") + (synopsis "Server process of Telega") + (description "Telega-server is helper program to interact with Telegram +service, and connect it with Emacs via inter-process communication.") + (license license:gpl3+))) + (define-public emacs-telega ;; This package has versions newer than indicated on MELPA. ;; Get the current version from `telega-version` in telega.el. diff --git a/gnu/packages/patches/emacs-telega-patch-server-functions.patch b/gnu/packages/patches/emacs-telega-patch-server-functions.patch deleted file mode 100644 index e3d49278d0..0000000000 --- a/gnu/packages/patches/emacs-telega-patch-server-functions.patch +++ /dev/null @@ -1,31 +0,0 @@ -Remove interactive build for telega-server, as it fails on Guix. -Modify the `telega-server--find-bin' function to only use the version -of telega-server installed by Guix. - -Created by Brett Gilio - ---- a/telega-server.el -+++ b/telega-server.el -@@ -113,7 +113,6 @@ If already deferring, then just executes the BODY." - If BUILD-FLAGS is specified, then rebuild server without any - queries using this flags for building, could be empty string. - Otherwise query user about building flags." -- (interactive) - (telega-test-env 'quiet) - (when (or build-flags - (y-or-n-p "Build `telega-server'? ")) -@@ -137,11 +136,8 @@ Otherwise query user about building flags." - (defun telega-server--find-bin () - "Find telega-server executable. - Raise error if not found." -- (let ((exec-path (cons telega-directory exec-path))) -- (or (executable-find "telega-server") -- (progn (telega-server-build) -- (executable-find "telega-server")) -- (error "`telega-server' not found in exec-path")))) -+ (or (executable-find "telega-server") -+ (error "`telega-server' not found in exec-path"))) - - (defun telega-server-version () - "Return telega-server version." - diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch new file mode 100644 index 0000000000..c20be36712 --- /dev/null +++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch @@ -0,0 +1,44 @@ +From 865b8c553722a971c68742c2e849e41eb0e2360c Mon Sep 17 00:00:00 2001 +From: Zhu Zihao +Date: Thu, 24 Jun 2021 23:43:50 +0800 +Subject: [PATCH] Replace code that search path with placeholder for + configuration. + +--- + telega-server.el | 6 +----- + telega-util.el | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/telega-server.el b/telega-server.el +index 999125d..0fa0817 100644 +--- a/telega-server.el ++++ b/telega-server.el +@@ -142,11 +142,7 @@ Otherwise query user about building flags." + (defun telega-server--find-bin () + "Find telega-server executable. + Raise error if not found." +- (let ((exec-path (cons telega-directory exec-path))) +- (or (executable-find "telega-server") +- (progn (telega-server-build) +- (executable-find "telega-server")) +- (error "`telega-server' not found in exec-path")))) ++ "@TELEGA_SERVER_BIN@") + + (defun telega-server-version () + "Return telega-server version." +diff --git a/telega-util.el b/telega-util.el +index 73a46b1..f53e20a 100644 +--- a/telega-util.el ++++ b/telega-util.el +@@ -464,7 +464,7 @@ N can't be 0." + + (defun telega-etc-file (filename) + "Return absolute path to FILENAME from etc/ directory in telega." +- (expand-file-name (concat "etc/" filename) telega--lib-directory)) ++ (concat "@TELEGA_SHARE@" "/" filename)) + + (defun telega-link-props (link-type link-to &optional face) + "Generate props for link button openable with `telega-link--button-action'." +-- +2.32.0 + -- cgit v1.2.3 From a303be7c3b38109deb90b808838af34aa187dadd Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:26:51 +0800 Subject: gnu: emacs-telega: Update to 0.7.024. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.7.024. [build-system] Use emacs-build-system. [arguments] Add #:emacs. Drop outdated phases. Update ‘patch-sources’ phase to find new occurences of ffmpeg to patch. Add new ‘configure’ and ‘install-share-files’ phases. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 184 ++++++++++++++++----------------------------- 1 file changed, 65 insertions(+), 119 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1a749a05e8..b36db4dcc8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26273,125 +26273,71 @@ service, and connect it with Emacs via inter-process communication.") (license license:gpl3+))) (define-public emacs-telega - ;; This package has versions newer than indicated on MELPA. - ;; Get the current version from `telega-version` in telega.el. - ;; or by running M-x telega-version. - (let ((commit "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9") - (revision "1") - (version "0.7.1")) - (package - (name "emacs-telega") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zevlg/telega.el") - (commit commit))) - (sha256 - (base32 - "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7")) - (patches (search-patches - "emacs-telega-patch-server-functions.patch" - "emacs-telega-test-env.patch")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) - #:test-target "test" - ;; TODO: Currently tgVOIP is not functional, thus we have disabled it - ;; temporarily. - ;; #:make-flags (list "WITH_VOIP=t") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prefix-patch - (lambda _ - (substitute* "server/Makefile" - (("CC=cc") - ,(string-append "CC=" (cc-for-target))) - (("INSTALL_PREFIX=\\$\\(HOME\\)/.telega") - (string-append "INSTALL_PREFIX=" (assoc-ref %outputs "out") - "/bin")) - ;; Manually invoke `run_tests.py` after install phase. - (("python3 run_tests.py") - "")) - #t)) - (add-after 'unpack 'expand-load-path - (assoc-ref emacs:%standard-phases 'expand-load-path)) - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - ;; Hard-code paths to `ffplay` and `ffmpeg`. - (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg") - "/bin/ffplay")) - (ffmpeg-bin (string-append (assoc-ref inputs "ffmpeg") - "/bin/ffmpeg"))) - (substitute* "telega-ffplay.el" - (("\\(executable-find \"ffplay\"\\)") - (string-append - "(and (file-executable-p \"" ffplay-bin "\")" - "\"" ffplay-bin "\")")) - (("\\(executable-find \"ffmpeg\"\\)") - (string-append - "(and (file-executable-p \"" ffmpeg-bin "\")" - "\"" ffmpeg-bin "\")")))) - ;; This would push the "contrib" sources to the load path, - ;; but as contrib is not installed alongside telega, it does - ;; nothing. - (substitute* "telega.el" - (("\\(push .* load-path\\)") "")) - #t)) - ;; The server test suite has a hardcoded path. - ;; Reset this behavior to use the proper path. - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "server/run_tests.py" - (("~/.telega/telega-server") - (string-append (assoc-ref %outputs "out") - "/bin/telega-server"))) - #t)) - (add-after 'install 'run-server-suite - (lambda _ - (invoke "python3" "server/run_tests.py") - #t)) - (delete 'configure) - (add-after 'expand-load-path 'emacs-install - (lambda args - (apply (assoc-ref emacs:%standard-phases 'install) - #:include `("etc" ,@emacs:%default-include) - args))) - (add-after 'emacs-install 'emacs-build - (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) - (inputs - `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. - (propagated-inputs - `(("emacs-visual-fill-column" ,emacs-visual-fill-column) - ("emacs-company" ,emacs-company) - ("emacs-rainbow-identifiers" - ,emacs-rainbow-identifiers) - ("libwebp" ,libwebp))) ; sticker support. - (native-inputs - `(("tdlib" ,tdlib) - ;; Use Emacs with wide ints on 32-bit architectures. - ("emacs" ,(match (%current-system) - ((or "i686-linux" "armhf-linux") - emacs-wide-int) - (_ - emacs))) - ("python" ,python))) - (synopsis "GNU Emacs client for the Telegram messenger") - (description - "Telega is a full-featured, unofficial GNU Emacs-based client for the -Telegram messaging platform.") - (home-page "https://zevlg.github.io/telega.el/") - (license license:gpl3+)))) + (package + (inherit emacs-telega-server) + (name "emacs-telega") + (build-system emacs-build-system) + (arguments + `(#:emacs ,(if (target-64bit?) + emacs-minimal + ;; Require wide-int support for 32-bit platform. + emacs-wide-int) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; Hard-code paths to `ffplay` and `ffmpeg`. + (let* ((ffmpeg (assoc-ref inputs "ffmpeg")) + (ffmpeg-bin (string-append ffmpeg "/bin/ffmpeg")) + (ffplay-bin (string-append ffmpeg "/bin/ffplay"))) + (substitute* "telega-ffplay.el" + (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" + all func cmd) + (string-append func " \"" (assoc-ref inputs "ffmpeg") + "bin/" cmd)) + (("\\(executable-find \"ffplay\"\\)") + (string-append "(and (file-executable-p \"" ffplay-bin "\")" + "\"" ffplay-bin "\")")) + (("\\(executable-find \"ffmpeg\"\\)") + (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" + "\"" ffmpeg-bin "\")")))))) + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "telega-server.el" + (("@TELEGA_SERVER_BIN@") + (string-append (assoc-ref inputs "emacs-telega-server") + "/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))))) + (inputs + `(("emacs-telega-server" ,emacs-telega-server) + ("ffmpeg" ,ffmpeg))) + (native-inputs '()) + (propagated-inputs + `(("emacs-visual-fill-column" ,emacs-visual-fill-column) + ("emacs-company" ,emacs-company) + ("emacs-rainbow-identifiers" ,emacs-rainbow-identifiers))) + (synopsis "GNU Emacs client for the Telegram messenger") + (description "Telega is a full-featured, unofficial GNU Emacs-based client +for the Telegram messaging platform."))) (define-public emacs-telega-contrib (package/inherit emacs-telega -- cgit v1.2.3 From cd42e8001a82f60b6918ab8153d3a3d09380cdd5 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:29:30 +0800 Subject: gnu: emacs-telega-contrib: Update to 0.7.024. * gnu/packages/emacs-xyz.scm(emacs-telega-contrib): Update to 0.7.024. [arguments]<#:phases>: Back to root directory of build before phase 'install-license-files' to properly install licenses. [propagated-inputs]: Add emacs-dashboard, emacs-transient. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b36db4dcc8..3915899e81 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26340,19 +26340,28 @@ service, and connect it with Emacs via inter-process communication.") for the Telegram messaging platform."))) (define-public emacs-telega-contrib - (package/inherit emacs-telega + (package + (inherit emacs-telega) (name "emacs-telega-contrib") - (build-system emacs-build-system) (arguments `(#:exclude '("telega-live-location.el") #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "contrib") #t))))) + (add-after 'unpack 'enter-subdirectory + (lambda _ (chdir "contrib") #t)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..") #t))))) + (inputs '()) + (native-inputs '()) (propagated-inputs - `(("emacs-telega" ,emacs-telega) - ("emacs-alert" ,emacs-alert) - ("emacs-all-the-icons" ,emacs-all-the-icons))))) + `(("emacs-alert" ,emacs-alert) + ("emacs-all-the-icons" ,emacs-all-the-icons) + ("emacs-dashboard" ,emacs-dashboard) + ("emacs-telega" ,emacs-telega) + ("emacs-transient" ,emacs-transient))) + (synopsis "Contributed packages to Telega") + (description "Telega-contrib is a collection of third-party +contributed packages to Telega."))) (define-public emacs-doom-modeline (package -- cgit v1.2.3 From 55d8eca5e9fccec4086985b5ed4a3e75cd0dd467 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 9 Jul 2021 15:06:11 +0200 Subject: gnu: emacs-telega-server: Update to 0.7.025. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.025. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3915899e81..5d9db51b08 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26223,7 +26223,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.024") + (version "0.7.025") (source (origin (method git-fetch) @@ -26231,7 +26231,7 @@ 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 "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j")) + (base32 "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- cgit v1.2.3 From 4236b8586d9a644d6521c8303863125439aabce8 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 9 Jul 2021 15:06:45 +0200 Subject: gnu: emacs-xyz: Fix indentation. * gnu/packages/emacs-xyz.scm: Delete trailing newline. (emacs-purescript-mode): Delete trailing space. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d9db51b08..6ac61fd596 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7065,7 +7065,7 @@ linting of manifests and integration with Puppet Debugger.") (add-before 'install 'make-info (lambda _ (invoke "makeinfo" "--no-split" - "-o" "purescript-mode.info" "purescript-mode.texi")))))) + "-o" "purescript-mode.info" "purescript-mode.texi")))))) (native-inputs `(("texinfo" ,texinfo))) (home-page "https://github.com/purescript-emacs/purescript-mode") @@ -28911,4 +28911,3 @@ to the @url{https://multitran.com} online dictionary.") "Kibit Helper provides functions to work with the Kibit Leiningen plugin for detecting and improve non-idiomatic Clojure source code.") (license license:gpl3+))) - -- cgit v1.2.3 From 2086a6a335a23ae56485592f62c77cb088d62fff Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 9 Jul 2021 22:58:34 +0800 Subject: gnu: emacs-telega: Fix 'patch-source' phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-telega)[#:phases]: Add missing slash in ‘/bin’ when patching general commands. Also patch telega-vvnote.el. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6ac61fd596..16cd0d8b5b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26290,17 +26290,17 @@ service, and connect it with Emacs via inter-process communication.") (let* ((ffmpeg (assoc-ref inputs "ffmpeg")) (ffmpeg-bin (string-append ffmpeg "/bin/ffmpeg")) (ffplay-bin (string-append ffmpeg "/bin/ffplay"))) - (substitute* "telega-ffplay.el" - (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" - all func cmd) - (string-append func " \"" (assoc-ref inputs "ffmpeg") - "bin/" cmd)) - (("\\(executable-find \"ffplay\"\\)") - (string-append "(and (file-executable-p \"" ffplay-bin "\")" - "\"" ffplay-bin "\")")) - (("\\(executable-find \"ffmpeg\"\\)") - (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" - "\"" ffmpeg-bin "\")")))))) + (substitute* '("telega-ffplay.el" "telega-vvnote.el") + (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" + all func cmd) + (string-append func " \"" (assoc-ref inputs "ffmpeg") + "/bin/" cmd)) + (("\\(executable-find \"ffplay\"\\)") + (string-append "(and (file-executable-p \"" ffplay-bin "\")" + "\"" ffplay-bin "\")")) + (("\\(executable-find \"ffmpeg\"\\)") + (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" + "\"" ffmpeg-bin "\")")))))) (add-after 'unpack 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "telega-server.el" -- cgit v1.2.3 From 314beace600da453941e01026db7c724d8933a9e Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 9 Jul 2021 14:45:19 +0300 Subject: gnu: emacs-dash: Update to 2.19.0. * gnu/packages/emacs-xyz.scm (emacs-dash): Update to 2.19.0. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 16cd0d8b5b..9f9f9909b3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3366,7 +3366,7 @@ restore the saved place.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.18.1") + (version "2.19.0") (source (origin (method git-fetch) (uri (git-reference @@ -3375,7 +3375,7 @@ restore the saved place.") (file-name (git-file-name name version)) (sha256 (base32 - "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva")))) + "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h")))) (build-system emacs-build-system) (arguments `(#:tests? #t)) (home-page "https://github.com/magnars/dash.el") -- cgit v1.2.3 From 71dffaacbfc6fc9e846bf374a07d7f07bb5b7cf0 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 15 Jul 2021 19:25:04 +0200 Subject: gnu: emacs-pyim: Update to 3.9.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.9.2. Signed-off-by: 宋文武 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9f9f9909b3..381c216f69 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13453,13 +13453,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "3.9.0") + (version "3.9.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "1rpmw2x9gqwaw96086bfx8vkvxnw03wnclq7psi8zjb6ayz3p2qj")))) + (base32 "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3