From 54693d1742067d5c7300e90a6fa8a096e1ce0173 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 10:30:47 +0100 Subject: gnu: emacs-exwm: Update to 0.25. * gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.25. --- 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 543ce6303a..b2f84c1427 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14053,7 +14053,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.24") + (version "0.25") (synopsis "Emacs X window manager") (source (origin @@ -14061,7 +14061,7 @@ It should enable you to implement low-level X11 applications.") (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")) + (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7")) (patches ;; Patch fixing fullscreen view. Applied upstream as ;; edb930005b0ba83051ca8a59b493e9a3c8ef580a. It can be removed in -- cgit v1.2.3 From 44ae53f8a18cc84ae05466cccfcd56605316aa85 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 10:31:02 +0100 Subject: gnu: emacs-tramp: Update to 2.5.1.4. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.1.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 b2f84c1427..8e3f3895ed 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25315,14 +25315,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.1.3") + (version "2.5.1.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1qcwdavfrbw8yyfy5rbzbcfyqavqbz13jncahkqlgwbkqvmgh7y5")))) + (base32 "0mk9r9hj43klah7mwldg4bw7fxcqvrbwv1gj6g90zdfsflqy7nh9")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From f66a09432d6741b3d34b03b09130ad26ee011056 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:29:03 +0100 Subject: gnu: emacs-ecukes: Update to 0.6.18. * gnu/packages/emacs-xyz.scm (emacs-ecukes): Update to 0.6.18. --- 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 8e3f3895ed..3840a11722 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4334,17 +4334,16 @@ Expectations, but it can be used in other contexts.") (define-public emacs-ecukes (package (name "emacs-ecukes") - (version "0.6.17") - (home-page "https://github.com/ecukes/ecukes") + (version "0.6.18") (source (origin (method git-fetch) (uri (git-reference - (url home-page) + (url "https://github.com/ecukes/ecukes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn")))) + (base32 "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include))) @@ -4355,6 +4354,7 @@ Expectations, but it can be used in other contexts.") ("emacs-espuds" ,emacs-espuds) ("emacs-f" ,emacs-f) ("emacs-s" ,emacs-s))) + (home-page "https://github.com/ecukes/ecukes") (synopsis "Cucumber for Emacs") (description "This package provides Ecukes, a Cucumber-inspired integration testing -- cgit v1.2.3 From 1e727e1adb8f75b158f6e0a7eee2c91f4308f11b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:30:17 +0100 Subject: gnu: emacs-olivetti: Update to 2.0.4. * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update to 2.0.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 3840a11722..8e714e492e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3798,7 +3798,7 @@ a command.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.3") + (version "2.0.4") (source (origin (method git-fetch) @@ -3807,7 +3807,7 @@ a command.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z")))) + (base32 "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") -- cgit v1.2.3 From 48ad405601dce9666524e85cf1ab119d99875dfa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:31:10 +0100 Subject: gnu: emacs-org-reveal: Update to 3.12.4. * gnu/packages/emacs-xyz.scm (emacs-org-reveal): Update to 3.12.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 8e714e492e..d021c7f39e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18958,7 +18958,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.12.3") + (version "3.12.4") (source (origin (method git-fetch) @@ -18967,7 +18967,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08ai87b6nybg0l7y8falb53wwvdv8hr3jzj5q995x48ylw6r1582")))) + (base32 "0j7394zcbzqfk33g2xdyb3fmw3brxy8v66vvf1j9nqlskfddh7bn")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-htmlize" ,emacs-htmlize) -- cgit v1.2.3 From d170435400b972a5294e9dc24a5a3d40194fc9e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:34:11 +0100 Subject: gnu: emacs-rustic: Update to 2.0. * gnu/packages/emacs-xyz.scm (emacs-rustic): Update to 2.0. [propagated-inputs]: Add emacs-rust-mode. --- gnu/packages/emacs-xyz.scm | 79 ++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 41 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d021c7f39e..81b511e913 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21713,45 +21713,42 @@ source code.") 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. + (package + (name "emacs-rustic") + (version "2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brotzeit/rustic") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2")))) + (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-rust-mode" ,emacs-rust-mode) + ("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, @@ -21765,8 +21762,8 @@ In addition to its predecessor, it offers the following features: @item optional Rust inline documentation, @item etc. @end itemize") - (license (list license:expat - license:asl2.0))))) + (license (list license:expat + license:asl2.0)))) (define-public emacs-ztree ;; Upstream provides no tag, but the commit below matches latest release. -- cgit v1.2.3 From 7aa1260d2983292948058c3ddde2d656c3077b1b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:35:27 +0100 Subject: gnu: emacs-rust-mode: Update to 1.0.1. * gnu/packages/emacs-xyz.scm (emacs-rust-mode): Update to 1.0.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 81b511e913..800f5ea427 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21691,7 +21691,7 @@ docstring of the thing at point.") (define-public emacs-rust-mode (package (name "emacs-rust-mode") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -21700,7 +21700,7 @@ docstring of the thing at point.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08gz7wq1las3bqqs8qhmhmncax4j6kjnyxpfzslby3b1dkclc7ig")))) + (base32 "1chb3a97cwf1pkxn8cm3wc35gfh9k55l7khg7pklmx36isr3csjv")))) (build-system emacs-build-system) (arguments `(#:tests? #false ;FIXME: phase fail with status 127 -- cgit v1.2.3 From 9e5ab292c2925b5f15a9746ddfdc6b19c799e2ac Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:36:38 +0100 Subject: gnu: emacs-transient: Update to 0.3.7. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.3.7. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 800f5ea427..dcd4613406 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24165,16 +24165,16 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/transient") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy")))) + (version "0.3.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/transient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0c7wbd0j0b802bzdpdkrx2q7wm7b9s56rk554dnadkpywhmdiqwn")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite -- cgit v1.2.3 From a4666e0a9de3835d12d3d85c7d23b807997ae603 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 12:38:35 +0100 Subject: gnu: emacs-treemacs: Update to 2.9.5. * gnu/packages/emacs-xyz.scm (emacs-treemacs): Update to 2.9.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 dcd4613406..52ce3943ad 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23814,7 +23814,7 @@ processes for Emacs") (define-public emacs-treemacs (package (name "emacs-treemacs") - (version "2.9.4") + (version "2.9.5") (source (origin (method git-fetch) @@ -23823,7 +23823,7 @@ processes for Emacs") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p")))) + (base32 "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ace-window" ,emacs-ace-window) -- cgit v1.2.3 From b5e7a64ccf75d9eb6ab5de9078ff1a21c5622177 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 18:50:02 +0100 Subject: gnu: emacs-emms: Update to 7.8. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 7.8. --- 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 52ce3943ad..600cbdb46c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2117,14 +2117,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "7.7") + (version "7.8") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h")))) + (base32 "1nlb9rrdlbcqghph30r9i9m1brbdha818czbms0zhzdisxb0smi0")))) (build-system gnu-build-system) (arguments `(#:make-flags '("emms-print-metadata") -- cgit v1.2.3 From aef51732226c38a919c8845d649e9bb05433ed03 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 19:06:51 +0100 Subject: gnu: emacs-embark: Update to 0.13. * gnu/packages/emacs-xyz.scm (emacs-embark): Update to 0.13. [description]: Fix typo. --- gnu/packages/emacs-xyz.scm | 51 ++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 600cbdb46c..5f054c698d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8207,40 +8207,43 @@ them easier to distinguish from other, less important buffers.") (license license:expat))) (define-public emacs-embark - (package - (name "emacs-embark") - (version "0.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oantolin/embark") - (commit version))) - (sha256 - (base32 "16z7g6ynj4d64wsg49skhwypn5j6awlpsawbz61djsmpzlzjnv36")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-avy" ,emacs-avy) - ("emacs-consult" ,emacs-consult))) - (home-page "https://github.com/oantolin/embark") - (synopsis "Emacs mini-buffer actions rooted in keymaps") - (description - "This package provides a sort of right-click contextual menu for Emacs + ;; XXX: Upstream did not tag last release. Commit hash below matches + ;; version bump. + (let ((commit "bc3e4654329563ab28a96003610634c3a5e5a484")) + (package + (name "emacs-embark") + (version "0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oantolin/embark") + (commit commit))) + (sha256 + (base32 "1x6m6gc32z7kv9nkr8mwhi9mimbwhd37qyxpwj33hml9ygi8s7r6")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy) + ("emacs-consult" ,emacs-consult))) + (home-page "https://github.com/oantolin/embark") + (synopsis "Emacs mini-buffer actions rooted in keymaps") + (description + "This package provides a sort of right-click contextual menu for Emacs offering you relevant @emph{actions} to use on a @emph{target} determined by the context. In the minibuffer, the target is the current best completion candidate. In -the @code{*Completions*} buffer the target is the completion at point. -n a regular buffer, the target is the region if active, or else the file, -symbol or URL at point. +the @code{*Completions*} buffer the target is the completion at point. In +a regular buffer, the target is the region if active, or else the file, symbol +or URL at point. The type of actions offered depend on the type of the target. For files you get offered actions like deleting, copying, renaming, visiting in another window, running a shell command on the file, etc. For buffers the actions include switching to or killing the buffer. For package names the actions include installing, removing or visiting the homepage.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-prescient (package -- cgit v1.2.3 From 8d02b0d46cfc27b905f9276760aefacf518ae4f7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Nov 2021 19:11:40 +0100 Subject: gnu: emacs-extmap: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-extmap): Update to 1.2.1. [description]: Use full sentences. --- 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 5f054c698d..ea6d84d556 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28743,7 +28743,7 @@ and Emacs lisp commands.") (define-public emacs-extmap (package (name "emacs-extmap") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) @@ -28752,11 +28752,11 @@ and Emacs lisp commands.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dl630jl46jz5slpv28l8b745051ghp0g296x5180vl5v88v3hsl")))) + (base32 "00415w4l9wfpw9v0a35dm1av2w1m6s36yr9f9286jg844x6l375f")))) (build-system emacs-build-system) (home-page "https://github.com/doublep/extmap") (synopsis "Externally-stored constant mapping for Emacs Lisp") - (description "A very simple package that lets you build a + (description "Extmap is a very simple package that lets you build a read-only, constant database that maps Emacs Lisp symbols to arbitrary Emacs Lisp objects.") (license license:gpl3+))) -- cgit v1.2.3 From 87e57cbecbd166c549283224a28a5c68d2a9800c Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 2 Nov 2021 12:12:04 +0100 Subject: gnu: emacs-exwm: Remove obsolete patch. * gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/emacs-xyz.scm (emacs-exwm)[source]: Remove patch. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 7 +--- .../patches/emacs-exwm-fix-fullscreen-states.patch | 39 ---------------------- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index bbc54eff4f..b6cc3aacea 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,7 +1024,6 @@ dist_patch_DATA = \ %D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/emacs-exec-path.patch \ - %D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea6d84d556..4980516bcd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14064,12 +14064,7 @@ It should enable you to implement low-level X11 applications.") (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7")) - (patches - ;; Patch fixing fullscreen view. Applied upstream as - ;; edb930005b0ba83051ca8a59b493e9a3c8ef580a. It can be removed in - ;; next release. - (search-patches "emacs-exwm-fix-fullscreen-states.patch")))) + (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) diff --git a/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch b/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch deleted file mode 100644 index 6d31021f67..0000000000 --- a/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch +++ /dev/null @@ -1,39 +0,0 @@ -From edb930005b0ba83051ca8a59b493e9a3c8ef580a Mon Sep 17 00:00:00 2001 -From: Chris Feng -Date: Sun, 14 Jun 2020 00:00:00 +0000 -Subject: [PATCH] Fix fullscreen states - -* exwm-layout.el (exwm-layout-set-fullscreen, -exwm-layout-unset-fullscreen): Use `exwm--id' for interactive use. -(exwm-layout-unset-fullscreen): Mandatorily clear fullscreen states. ---- - exwm-layout.el | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/exwm-layout.el b/exwm-layout.el -index 170c2be..79d0c95 100644 ---- a/exwm-layout.el -+++ b/exwm-layout.el -@@ -205,7 +205,7 @@ - :border-width 0 - :stack-mode xcb:StackMode:Above)) - (cl-pushnew xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state) -- (exwm-layout--set-ewmh-state id) -+ (exwm-layout--set-ewmh-state exwm--id) - (xcb:flush exwm--connection) - (set-window-dedicated-p (get-buffer-window) t) - (exwm-input--release-keyboard exwm--id))) -@@ -233,7 +233,9 @@ - (let ((window (get-buffer-window nil t))) - (when window - (exwm-layout--show exwm--id window)))) -- (exwm-layout--set-ewmh-state id) -+ (setq exwm--ewmh-state -+ (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)) -+ (exwm-layout--set-ewmh-state exwm--id) - (xcb:flush exwm--connection) - (set-window-dedicated-p (get-buffer-window) nil) - (when (eq 'line-mode exwm--selected-input-mode) --- -2.26.2 - -- cgit v1.2.3 From c06857e5e1ea2edf0928826fb67a45205ceff58d Mon Sep 17 00:00:00 2001 From: Aleksandr Vityazev Date: Mon, 1 Nov 2021 14:42:42 +0000 Subject: gnu: emacs-link-hint: Update to 0.1-4-83cd0489. * gnu/packages/emacs-xyz.scm (emacs-link-hint): Update to 0.1-4-83cd0489. 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 4980516bcd..8eb6d0fd88 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2517,8 +2517,8 @@ configuration language. It features: (define-public emacs-link-hint ;; Last release was in 2015. - (let ((commit "9fbf196d155016d9b8471a99318ed67a086cf257") - (revision "3")) + (let ((commit "83cd0489b16f013647d0507ef20905a0a91db433") + (revision "4")) (package (name "emacs-link-hint") (version (git-version "0.1" revision commit)) @@ -2531,7 +2531,7 @@ configuration language. It features: (file-name (git-file-name name version)) (sha256 (base32 - "0v2g9gzf2v88ag59q1pf5vhd4qjnz3g4i6gzl27k6fi7pvlxdn39")))) + "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-avy" ,emacs-avy))) -- cgit v1.2.3 From 5fb1d1d69015a9198cb3cb20a373969342e96951 Mon Sep 17 00:00:00 2001 From: Aleksandr Vityazev Date: Mon, 1 Nov 2021 14:43:11 +0000 Subject: gnu: Add emacs-orglink. * gnu/packages/emacs-xyz.scm (emacs-orglink): 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 8eb6d0fd88..cf4cbc4f3d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28879,6 +28879,26 @@ web feed files and correctly parse and format the elements to be displayed for sharing.") (license license:gpl3+))) +(define-public emacs-orglink + (package + (name "emacs-orglink") + (version "1.1.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tarsius/orglink") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg")))) + (build-system emacs-build-system) + (home-page "https://github.com/tarsius/orglink") + (synopsis "Use Org mode links in other modes") + (description "This library implements support for some Org mode link types +in other major modes. Links can be opened and edited like in Org mode.") + (license license:gpl3+))) + (define-public emacs-scpaste (let ((commit "cd4fa0aafecd839736e0b6cba68b4fc4d7045472") (revision "0")) -- cgit v1.2.3 From 5c4ec50130205017b7934730852659153e6b5b3e Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 29 Oct 2021 23:45:39 -0400 Subject: gnu: emacs-org-contrib: Remove org-contacts.el. * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[origin]: Remove "org-contacts.el". Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 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 cf4cbc4f3d..2a68ac2432 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12304,8 +12304,12 @@ programming and reproducible research.") ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on ;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+ ;; release as the file is going to be removed from the repository. + + ;; XXX: org-contacts.el is now maintained in a separate repository and + ;; will soon be removed from org-contrib (modules '((guix build utils))) - (snippet '(begin (delete-file "lisp/ob-sclang.el"))))) + (snippet '(begin (delete-file "lisp/ob-sclang.el") + (delete-file "lisp/org-contacts.el"))))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From f46ae49b13b78e054e402db778a86ccfafdf7eab Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 29 Oct 2021 23:45:40 -0400 Subject: gnu: Add emacs-org-contacts. * gnu/packages/emacs-xyz.scm (emacs-org-contacts): 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 2a68ac2432..624fe957e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12329,6 +12329,30 @@ receive little if no maintainance and there is no guaranty that they are compatible with the Org stable version.") (license license:gpl3+))) +(define-public emacs-org-contacts + ;;; XXX: Upstream made no release yet. + (let ((commit "3d2f39f62aefb0a32d10607703e8b1d4f43821fa") + (revision "0")) + (package + (name "emacs-org-contacts") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stardiviner/org-contacts.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a654406w8zd1hbp8ckc975jhl9mi14xzqizzwiki625dymiw5g5")))) + (build-system emacs-build-system) + (home-page "https://github.com/stardiviner/org-contacts.el") + (synopsis "Contacts management system for Org mode") + (description "Manage your contacts from Org mode. You can auto +complete email addresses, export contacts to a vCard file, put birthdays +in your Org Agenda, and more.") + (license license:gpl3+)))) + (define-public emacs-org-pretty-table ;; There is no release yet. (let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef") -- cgit v1.2.3