aboutsummaryrefslogtreecommitdiff
path: root/emacs/guix-helper.scm.in
blob: 0bbd36be21de7ad24e0829308257caca223f62fc (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:

;; This is an auxiliary file for the Emacs UI.  It is used to add Guix
;; directories to path variables and to load the main code.

;;; Code:

(use-modules (ice-9 regex)
             (srfi srfi-26))

(define %guix-dir)

;; The code is taken from ‘guix’ executable script
(define (set-paths!)
  (define-syntax-rule (push! elt v) (set! v (cons elt v)))

  (define config-lookup
    (let ((config '(("prefix"         . "@prefix@")
                    ("guilemoduledir" . "@guilemoduledir@")))
          (var-ref-regexp (make-regexp "\\$\\{([a-z]+)\\}")))
      (define (expand-var-ref match)
        (lookup (match:substring match 1)))
      (define (expand str)
        (regexp-substitute/global #f var-ref-regexp str
                                  'pre expand-var-ref 'post))
      (define (lookup name)
        (expand (assoc-ref config name)))
      lookup))

  (let ((module-dir (config-lookup "guilemoduledir"))
        (updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
                                (and=> (getenv "HOME")
                                       (cut string-append <> "/.config")))
                            (cut string-append <> "/guix/latest"))))
    (push! module-dir %load-path)
    (push! module-dir %load-compiled-path)
    (if (and updates-dir (file-exists? updates-dir))
        (begin
          (set! %guix-dir updates-dir)
          (push! updates-dir %load-path)
          (push! updates-dir %load-compiled-path))
        (set! %guix-dir module-dir))))

(set-paths!)

(load-from-path "guix-main")

om 009621092b4b332451d36d0232c3cf673f6d5e9f Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 7 Nov 2023 16:08:51 +0100 Subject: gnu: Add m2-planet-1.9.0 * gnu/packages/mes.scm (m2-planet-1.9.0): New variable. --- gnu/packages/mes.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 2a55258a92..3e0fdcd0fd 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -268,3 +268,19 @@ built as Phase-5 of the full source bootstrapping process and is capable of building GNU Mes.") (home-page "https://github.com/oriansj/m2-planet") (license gpl3+))) + +(define-public m2-planet-1.9.0 + (package + (inherit m2-planet) + (name "m2-planet") + (version "1.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oriansj/m2-planet") + (commit (string-append "Release_" version)) + (recursive? #t))) ;for M2libc + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cgvvq91cbxxm93k8ayyvhpaf3c2lv10qw4wyqwn3hc1qb1cfyvr")))))) -- cgit v1.2.3 From c7408f50d170d2c25480dd4aa207de884955cf81 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 7 Nov 2023 16:08:59 +0100 Subject: gnu: mes: Use m2-planet-1.9.0. * gnu/packages/mes.scm (mes)[native-inputs]: Revert to m2-planet-1.9.0. Change-Id: Iac504f5b46bac4c989af914415b14955a072278e --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 3e0fdcd0fd..ba925fe4d1 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -176,7 +176,7 @@ parsers to allow execution with Guile as extension languages."))) (else '()))) (list graphviz help2man - m2-planet + m2-planet-1.9.0 perl ;build-aux/gitlog-to-changelog texinfo))) (build-system gnu-build-system) -- cgit v1.2.3 From d01a1380930cce8e2e1667e3570cda554216bee1 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 5 Nov 2023 17:30:26 +0100 Subject: gnu: tdlib: Update to 1.8.20. * gnu/packages/messaging.scm (tdlib): Update to 1.8.20. Signed-off-by: Andrew Tropin --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c669b6f139..1c5bc4bbd7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2636,11 +2636,11 @@ replacement.") (license license:gpl2+))) (define-public tdlib - (let ((commit "4d1d22d6f477d61f6ff2b8f6e49de1847092c5b4") + (let ((commit "4ed0b23c9c99868ab4d2d28e8ff244687f7b3144") (revision "0")) (package (name "tdlib") - (version (git-version "1.8.16" revision commit)) + (version (git-version "1.8.20" revision commit)) (source (origin (method git-fetch) @@ -2648,7 +2648,7 @@ replacement.") (url "https://github.com/tdlib/td") (commit commit))) (sha256 - (base32 "0nv921k795kq0l993rxzd5pm5v3l3mnwbaxb7d7d0m0506l4w9fk")) + (base32 "16kprlcnphi89yfwgnlaxjwwb1xx24az8xd710rx8cslb4zv00qw")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From fd20e0d5f4896c6c8bf440df7c39187df3b3ce2e Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 5 Nov 2023 17:32:16 +0100 Subject: gnu: emacs-telega-server: Update to 0.8.203. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.8.203. Signed-off-by: Andrew Tropin --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 57e2716b81..dfc959ca0a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33992,11 +33992,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "17bfa50c8f2e70daeb8866f3bf195f15623ab520") - (revision "1")) + (let ((commit "4f08c835c08e762137ca04e12055cf9dc0b2b8cf") + (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.03" revision commit)) + (version (git-version "0.8.203" revision commit)) (source (origin (method git-fetch) @@ -34004,7 +34004,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "1057zr4g8llxmzy47l5klyi89x66q8qx5vrd50pmpsp4c6772jz9")) + (base32 "02iv2cxwsmfpx2b6wvp7l22izvqw21f1b98jm0yihmfh39idxwn8")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- cgit v1.2.3 From e18af936ff85442a841886c9434f862fb595a8b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 11 Oct 2023 08:41:17 -0400 Subject: gnu: mdds: Update to 2.1.1. * gnu/packages/boost.scm (mdds): Update to 2.1.1. [source]: Fetch from git. [native-inputs]: New field. Change-Id: I4e71d5c360f4b7305cffd7008e2bbbfcaad2f897 --- gnu/packages/boost.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 98dccf7f16..71999709ed 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2018, 2020 Maxim Cournoyer +;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer ;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Giacomo Leidi @@ -44,6 +44,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages icu4c) #:use-module (gnu packages llvm) @@ -445,15 +446,18 @@ signals and slots system.") (define-public mdds (package (name "mdds") - (version "2.0.3") + (version "2.1.1") (source (origin - (method url-fetch) - (uri (string-append "https://kohei.us/files/mdds/src/mdds-" - version ".tar.xz")) - (sha256 - (base32 - "1r68kxqppmhfg0dhz54d0hqzs5882cqrv1x6wpg7lak6gyyws0bc")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mdds/mdds") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0866020brc1kmiryh7dmhjamnywlsd56ks649hy87283k0p7d3bb")))) (build-system gnu-build-system) + (native-inputs (list autoconf automake)) (propagated-inputs (list boost)) ; inclusion of header files (home-page "https://gitlab.com/mdds/mdds") -- cgit v1.2.3 From 370468c5471a8bbb9862f8ec0d6b7aa3daa436cb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 11 Oct 2023 22:23:07 -0400 Subject: gnu: ixion: Update to 0.19.0. * gnu/packages/libreoffice.scm (ixion): Update to 0.19.0. [source]: Use git. [native-inputs]: Add autoconf, automake and libtool. Change-Id: I245457d7c99b6adfb895dc46276f8008ff13d0cd --- gnu/packages/libreoffice.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 71131ca1f3..e38095fb1e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,20 +93,19 @@ (define-public ixion (package (name "ixion") - (version "0.17.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/ixion/src/libixion-" - version ".tar.xz")) - (sha256 - (base32 - "07hhqkvns4da8xv990gr1smqz1zf40m531lg95nphfrz48wp3jak")))) + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/ixion/ixion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nycbs3765wkaw9ff7aflm56ayxkn15dlfl5pbbb9b5i2rcv3dq6")))) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list mdds python spdlog)) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list mdds python spdlog)) (home-page "https://gitlab.com/ixion/ixion") (synopsis "General purpose formula parser and interpreter") (description "Ixion is a library for calculating the results of formula -- cgit v1.2.3 From e4443561d2b40d428548bc1a32032219da4f273e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 11 Oct 2023 22:24:49 -0400 Subject: gnu: orcus: Update to 0.19.0. * gnu/packages/libreoffice.scm (orcus): Update to 0.19.0. [source]: Use git-fetch/lfs. [arguments]: Use gexps. [native-inputs]: Add autoconf, automake and libtool. Change-Id: I76efbc57ca4acf8ffd5154a72e49b4aedd071a76 --- gnu/packages/libreoffice.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e38095fb1e..572077a0ee 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -117,22 +117,22 @@ their dependencies automatically upon calculation.") (define-public orcus (package (name "orcus") - (version "0.17.2") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/orcus/src/lib" - "orcus-" version ".tar.xz")) - (sha256 - (base32 - "1as04qb74jnlnwy4wh5jwaw2nnzgn2s3230ymvh3kx1w9r0rsl1h")))) + (version "0.19.0") + (source (origin + ;; The test suite requires data files store with Git Large + ;; File Storage. + (method git-fetch/lfs) + (uri (git-reference + (url "https://gitlab.com/orcus/orcus") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02prj6kgph56fkr89k8wlqarrmx65cq92863i4rrny5sqr8c2llr")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--disable-static"))) - (native-inputs - (list pkg-config)) - (inputs - (list ixion mdds python zlib)) + (arguments (list #:configure-flags #~(list "--disable-static"))) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list ixion mdds python zlib)) (home-page "https://gitlab.com/orcus/orcus") (synopsis "File import filter library for spreadsheet documents") (description "Orcus is a library that provides a collection of standalone -- cgit v1.2.3 From 36c03db7cefead5841f1e5cb2a6d092fede06604 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Nov 2023 22:29:00 -0500 Subject: gnu: libcmis: Update to 0.6.0. * gnu/packages/libreoffice.scm (libcmis): Update to 0.6.0. Change-Id: I2aeb6ecd67fcb281e61fbd48b4aa63d2763007a3 --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 572077a0ee..cd6c503af6 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -353,7 +353,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (name "libcmis") ;; Note: Use an unreleased version because libreoffice requires it and ;; is the only user (see ). - (version "0.5.2-46-gf264a61") + (version "0.6.0") (home-page "https://github.com/tdf/libcmis") (source (origin @@ -363,7 +363,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (file-name (git-file-name name version)) (sha256 (base32 - "06ff5vw0xrymvvna18wlaayyk20755sk2541i1gh7zpbmncs2ni6")))) + "17jx9fb7nmyp6jhz9nlmb3wcp8k03vhcv7sqql6a7jhsjnw3hq0k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool cppunit pkg-config)) -- cgit v1.2.3 From f296ceaafc65b53f1f65d3eab0a01aef2e415a36 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 Oct 2023 00:41:50 -0400 Subject: gnu: Add frozen. * gnu/packages/cpp.scm (frozen): New variable. Change-Id: I738dfcfa55ddb824c2186fb61484a8a3c9532b35 --- gnu/packages/cpp.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0ce60c49de..49e5b52e5f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022, 2023 David Elsing ;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Sughosha ;;; Copyright © 2023 Artyom V. Poptsov @@ -609,6 +609,47 @@ container which uses the order in which keys were inserted to the container as ordering relation.") (license license:expat))) +(define-public frozen + ;; The test suite fails to compile with the latest 1.1.1 release; use a + ;; newer commit (see: + ;; https://github.com/serge-sans-paille/frozen/issues/163). + (let ((commit "dd1f58c5f6c97fbf0832cc4e84676663839b913e") + (revision "0")) + (package + (name "frozen") + (version (git-version "1.1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/serge-sans-paille/frozen") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06i307a7v6alxfy24d47b1sjkz5f4mrqwl2vb4j8zx7wlgnrf08b")))) + (build-system cmake-build-system) + (home-page "https://github.com/serge-sans-paille/frozen") + (synopsis "C++ constexpr alternative header-only library") + (description "@code{frozen} is a header-only library that provides zero +cost initialization for immutable containers, fixed-size containers, and +various algorithms. It provides features such as: +@itemize +@item +immutable (also known as frozen), @code{constexpr}-compatible versions of +{std::set}, {std::unordered_set}, {std::map} and {std::unordered_map} +@item +fixed-capacity, @code{constinit}-compatible versions of @code{std::map} and +@code{std::unordered_map} with immutable, compile-time selected keys mapped to +mutable values. +@item +zero cost initialization version of @code{std::search} for frozen needles +using Boyer-Moore or Knuth-Morris-Pratt algorithms. +@end itemize +The @code{unordered_*} containers are guaranteed perfect (no hash +collision) and the extra storage is linear with respect to the number of +keys.") + (license license:asl2.0)))) + (define-public json-dto (package (name "json-dto") -- cgit v1.2.3 From 5da6e8961cad0e51b3a9ae7a0d5c384a08db1d78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Nov 2023 21:30:18 -0500 Subject: gnu: libreoffice: Update to 7.6.3.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 7.6.3.1. [native-inputs]: Add frozen. --- gnu/packages/libreoffice.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cd6c503af6..79b30cecaf 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) @@ -897,7 +898,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (define-public libreoffice (package (name "libreoffice") - (version "7.5.4.2") + (version "7.6.3.1") (source (origin (method url-fetch) @@ -906,7 +907,7 @@ commonly called @code{ftoa} or @code{dtoa}.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "1s3592ick745kl60yjlv7ki3p7nnwswj0mgjh3nk6k7skyvx3fv8")))) + (base32 "148084acq370483y0xwvcvck30kxhr78cnmibp5lks17xqp5f9q7")))) (build-system glib-or-gtk-build-system) (arguments (list @@ -1088,6 +1089,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (list bison cppunit flex + frozen ;header-only library pkg-config python-wrapper which -- cgit v1.2.3 From e8739da12e3cf9bc0477c3df65875de6a64d74c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Nov 2023 09:25:24 +0200 Subject: gnu: git-lfs: Support building on more systems. * gnu/packages/version-control.scm (git-lfs)[arguments]: Only run man-page related phases when ruby-asciidoctor is available. [native-inputs]: Only include ronn-ng, ruby-asciidoctor when building on a platform which has support for ruby-asciidoctor. Change-Id: Icbf8416998dc5d1f9d7c8299b4f929380dc29165 --- gnu/packages/version-control.scm | 45 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 76fa8ef5d0..cf9a2f7a4c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3188,26 +3188,33 @@ will reconstruct the object along its delta-base chain and return it.") #$(file-append (this-package-input "go-golang-org-x-net") "/src/golang.org/x/net/publicsuffix/data") "src/golang.org/x/net/publicsuffix/data"))) - (add-before 'build 'man-gen - ;; Without this, the binary generated in 'build - ;; phase won't have any embedded usage-text. - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "mangen")))) - (add-after 'build 'build-man-pages - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "man")))) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" - (for-each - (lambda (manpage) - (install-file manpage - (string-append #$output "/share/man/man1"))) - (find-files "." "^git-lfs.*\\.1$")))))))) + ;; Only build the man pages if ruby-asciidoctor is available. + #$@(if (this-package-native-input "ruby-asciidoctor") + #~((add-before 'build 'man-gen + ;; Without this, the binary generated in 'build + ;; phase won't have any embedded usage-text. + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "mangen")))) + (add-after 'build 'build-man-pages + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "man")))) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" + (for-each + (lambda (manpage) + (install-file manpage + (string-append #$output "/share/man/man1"))) + (find-files "." "^git-lfs.*\\.1$")))))) + #~())))) ;; make `ronn` available during build for man page generation - (native-inputs (list ronn-ng git-minimal ruby-asciidoctor)) + (native-inputs + (append (list git-minimal) + (if (supported-package? ruby-asciidoctor) + (list ronn-ng ruby-asciidoctor) + '()))) (propagated-inputs (list go-github-com-xeipuuv-gojsonschema go-github-com-xeipuuv-gojsonreference -- cgit v1.2.3 From b17567d45c03b7125bfe0255f4ac45d5db81a268 Mon Sep 17 00:00:00 2001 From: Jonathan Scoresby Date: Mon, 16 Oct 2023 12:15:11 +0300 Subject: gnu: vim: Add vim packages to 'package-path' instead of 'runtime-path'. This is neccesary because vim's built-in plugin manager looks for directories under 'package-path' instead of 'runtime-path.' Once we have told vim the package-path, it adds all the packages to the runtime-path automatically for us. * gnu/packages/aux-files/guix.vim: Add paths to packagepath instead of runtimepath. Remove code to adjust runtimepath after adding paths. Signed-off-by: Efraim Flashner --- gnu/packages/aux-files/guix.vim | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/guix.vim b/gnu/packages/aux-files/guix.vim index 9397c53701..24a6b941a8 100644 --- a/gnu/packages/aux-files/guix.vim +++ b/gnu/packages/aux-files/guix.vim @@ -1,13 +1,8 @@ -" This appends all of the vim plugins to the end of Vim's runtimepath. +" This appends all applicable vim paths to the end of packagepath. Once we +" have told vim the packagepath vim will add it to the runtimepath for us. for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $HOME ."/.guix-home/profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT] let vimplugins = directory . "/share/vim/vimfiles" if isdirectory(vimplugins) - let &rtp = join([&rtp,vimplugins], ',') + let &pp = join([&pp,vimplugins], ',') endif endfor -" Unconditionally add */after directories last, as intended by upstream -" TODO: Remove duplicate */after directories -for directory in [$VIM . "/vimfiles", $HOME ."/.vim"] - let vimplugins = directory . "/after" - let &rtp = join([&rtp,vimplugins], ',') -endfor -- cgit v1.2.3 From f879d5a03b59d3dab0ded356925f4bdc288690c9 Mon Sep 17 00:00:00 2001 From: Jonathan Scoresby Date: Mon, 16 Oct 2023 12:15:13 +0300 Subject: gnu: Have vim packages use vim-build-system. * gnu/packages/vim.scm (vim-neocomplete, vim-neocomplete-snippets, vim-neosnippet, vim-scheme, vim-luna, vim-fugitive, vim-airline, vim-airline-themes, vim-syntastic, neovim-syntastic, vim-solarized, vim-rainbow, editorconfig-vim, neovim-packer, vim-guix-vim, vim-asyncrun, vim-dispatch, vim-gemini-vim, vim-eunuch, vim-slime, vim-vlime, vim-paredit, vim-surround, vim-gnupg, vim-ctrlp, vim-mucomplete, vim-gitgutter, vim-characterize, vim-tagbar, vim-nerdtree, vim-nerdcommander): [build-system]: Switch to vim-build-system. [arguments]: Adjust accordingly. * gnu/packages/code.scm (global)[arguments]: Move vim files to their new location. * gnu/packages/lisp.scm (txr), * gnu/packages/mail.scm (msmtp), * gnu/packages/rust-apps.scm (skim), * gnu/packages/vim.scm (vifm), * gnu/packages/wm.scm (fluxbox): Same. Co-authored-by: Efraim Flashner Signed-off-by: Efraim Flashner Change-Id: I8b3e5d65d76a100c3dbddc1ae562b72966c2b304 --- gnu/packages/code.scm | 5 +- gnu/packages/lisp.scm | 5 +- gnu/packages/mail.scm | 3 +- gnu/packages/rust-apps.scm | 3 +- gnu/packages/vim.scm | 304 ++++++++++++++++----------------------------- gnu/packages/wm.scm | 3 +- 6 files changed, 122 insertions(+), 201 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 21a9f10a11..f53f7dc9e3 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -237,8 +237,9 @@ highlighting your own code that seemed comprehensible when you wrote it.") (lambda _ ;; Install the plugin files in the right place. (let* ((data (string-append #$output "/share/gtags")) - (vim (string-append #$output - "/share/vim/vimfiles/plugin")) + (vim (string-append + #$output + "/share/vim/vimfiles/pack/guix/start/global/plugin")) (lisp (string-append #$output "/share/emacs/site-lisp/" #$(package-name this-package) "-" #$(package-version this-package)))) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 15004f449e..f26362c79f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1061,8 +1061,9 @@ the HTML documentation of TXR.") '("txr-manpage.html" "txr-manpage.pdf"))))) (add-after 'install 'install-vim-files (lambda _ - (let ((syntax (string-append #$output - "/share/vim/vimfiles/syntax"))) + (let ((syntax (string-append + #$output + "/share/vim/vimfiles/pack/guix/start/txr/syntax"))) (install-file "tl.vim" syntax) (install-file "txr.vim" syntax))))))) (native-inputs diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5b5b29a468..256bd4b03a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1867,7 +1867,8 @@ addons which can add many functionalities to the base client.") (doc (string-append out "/share/doc/msmtp")) (msmtpq "scripts/msmtpq") (msmtpqueue "scripts/msmtpqueue") - (vimfiles (string-append out "/share/vim/vimfiles/syntax"))) + (vimfiles (string-append + out "/share/vim/vimfiles/pack/guix/start/msmtp/syntax"))) (install-file (string-append msmtpq "/msmtpq") bin) (install-file (string-append msmtpq "/msmtp-queue") bin) (install-file (string-append msmtpqueue "/msmtp-enqueue.sh") bin) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index a06447143a..eb5214f534 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2206,7 +2206,8 @@ consecutive lines and since program start.") (bin (string-append out "/bin")) (share (string-append out "/share")) (man (string-append out "/share/man")) - (vimfiles (string-append share "/vim/vimfiles/plugin")) + (vimfiles (string-append + share "/vim/vimfiles/pack/guix/start/skim/plugin")) (bash-completion (string-append share "/bash-completions/completions")) (zsh-site (string-append share "/zsh/site-functions")) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c2ed7b9249..469c8b64cb 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -31,17 +31,17 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages vim) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) - #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) + #:use-module (guix build-system vim) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) ; For GNU hostname @@ -299,12 +299,9 @@ written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages."))) (sha256 (base32 "1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "neocomplete")) (synopsis "Next generation completion framework for Vim") (description "@code{neocomplete}, an abbreviation of 'neo-completion with cache', @@ -332,10 +329,9 @@ features than Vim's built-in completion.") (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("neosnippets" "share/vim/vimfiles/")))) + (list #:plugin-name "neosnippet")) ; Extends neosnippet (synopsis "Snippets for neosnippet") (description "@code{neosnippet-snippets} provides standard snippets for the Vim plugin @@ -361,17 +357,9 @@ you can fill in on the fly.") (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("rplugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "neosnippet")) (synopsis "Snippet support for Vim") (description "@code{neosnippet}, is a plugin for Vim which adds snippet support to Vim. @@ -400,12 +388,9 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "04h946vr4f8wxap3wzqs69y2v8n50g2zbk22jsg2kxr4c01z5cbw")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("ftplugin" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-scheme")) (synopsis "Scheme syntax for Vim") (description "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") @@ -428,10 +413,9 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("colors" "share/vim/vimfiles/")))) + (list #:plugin-name "luna")) (synopsis "Dark color theme for Vim") (description "@code{vim-luna} is a dark color theme for Vim.") @@ -455,11 +439,9 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("autoload" "share/vim/vimfiles/")))) + (list #:plugin-name "context_filetype")) (synopsis "Context filetype library for Vim") (description "@code{vim-context-filetype} is context filetype library for Vim script.") @@ -479,15 +461,9 @@ trouble using them, because you do not have to remember each snippet name.") (file-name (git-file-name name version)) (sha256 (base32 "138290g2aph1jjhaza6biky5qi4ka6435s01bwxivllgb53g3irc")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "fugitive")) (home-page "https://github.com/tpope/vim-fugitive") (synopsis "Vim plugin to work with Git") (description "Vim-fugitive is a wrapper for Vim that complements the @@ -509,12 +485,9 @@ commit or run any Git arbitrary command.") (sha256 (base32 "1aksmr73648pvyc75pfdz28k2d4ky52rn7xiwcv7lz87q3vqld7k")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "airline")) (synopsis "Statusline for Vim") (description "@code{vim-airline} is an extensible statusline for Vim. @@ -540,12 +513,9 @@ and powerline symbols, etc.") (sha256 (base32 "1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "airline-themes")) (synopsis "Collection of themes for Vim-airline") (description "@code{vim-airline-themes} is a collection of themes for @code{vim-airline}.") @@ -565,13 +535,9 @@ and powerline symbols, etc.") (file-name (git-file-name name version)) (sha256 (base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax_checkers" "share/vim/vimfiles/")))) + (list #:plugin-name "syntastic")) (synopsis "Syntax checking plugin for Vim") (description "Vim-syntastic is a syntax checking plugin for Vim. It runs files through @@ -581,6 +547,17 @@ are detected, the user is notified.") (home-page "https://github.com/vim-syntastic/syntastic") (license license:wtfpl2))) +(define-public neovim-syntastic + (package + (inherit vim-syntastic) + (name "neovim-syntastic") + (synopsis "Syntax checking plugin for Neovim") + (description + "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through +external syntax checkers and displays any resulting errors to the user. This +can be done on demand, or automatically as files are saved. If syntax errors +are detected, the user is notified."))) + (define-public vim-solarized (let ((commit "62f656a02f93c5190a8753159e34b385588d5ff3") (revision "1")) @@ -596,11 +573,15 @@ are detected, the user is notified.") (file-name (git-file-name name version)) (sha256 (base32 "0001mz5v3a8zvi3gzmxhi3yrsb6hs7qf6i497arsngnvj2cwn61d")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("vim-colors-solarized/colors" "share/vim/vimfiles/") - ("vim-colors-solarized/doc" "share/vim/vimfiles/")))) + (list + #:plugin-name "solarized" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "vim-colors-solarized")))))) (home-page "https://github.com/altercation/vim-colors-solarized") (synopsis "Solarized color scheme for Vim") (description @@ -631,9 +612,16 @@ switching between the light and dark background modes.") (file-name (git-file-name name version)) (sha256 (base32 "1jya8wwlkmgs89hndrq6gsaskhk9g0fh62wdib8v9vz2x5g3738z")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan '(("opt" "share/vim/vimfiles/pack/rainbow/")))) + (list + #:plugin-name "rainbow" + #:mode "opt" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "opt/rainbow")))))) (home-page "https://github.com/mason1920/rainbow") (synopsis "Rainbow Parentheses Improved") (description @@ -656,12 +644,11 @@ codes by showing different levels of parentheses in different colors.") (sha256 (base32 "0mp80bi2m56bb93szw87vy6q5s85yk9g91sl4pr51316rgdv5kkv")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list + #:plugin-name "editorconfig" + #:vim? #t)) (home-page "https://editorconfig.org/") (synopsis "EditorConfig plugin for Vim") (description "EditorConfig makes it easy to maintain the correct coding @@ -686,11 +673,9 @@ editors.") (sha256 (base32 "1xn08z3a21mgfvp5i1nv57jnldwxwnl5nkryiff3zc99b1mizigp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - (list #:install-plan - #~'(("lua" "share/nvim/site/pack/guix/start/packer.nvim/") - ("doc" "share/nvim/site/pack/guix/start/packer.nvim/")))) + (list #:plugin-name "packer.nvim")) (home-page "https://github.com/wbthomason/packer.nvim") (synopsis "Plugin manager for Neovim") (description @@ -699,23 +684,6 @@ editors.") is based on Vim's builtin plugin support.") (license license:expat)))) -(define-public neovim-syntastic - (package - (inherit vim-syntastic) - (name "neovim-syntastic") - (arguments - '(#:install-plan - '(("autoload" "share/nvim/site/") - ("doc" "share/nvim/site/") - ("plugin" "share/nvim/site/") - ("syntax_checkers" "share/nvim/site/")))) - (synopsis "Syntax checking plugin for Neovim") - (description - "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through -external syntax checkers and displays any resulting errors to the user. This -can be done on demand, or automatically as files are saved. If syntax errors -are detected, the user is notified."))) - (define-public neovim (package (name "neovim") @@ -889,12 +857,12 @@ and support for fonts with ligatures.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (vifm (string-append out "/share/vifm")) - (vimfiles (string-append out "/share/vim/vimfiles"))) + (vimfiles (string-append + out "/share/vim/vimfiles/pack/guix/start/vifm"))) (copy-recursively (string-append vifm "/colors") (string-append vimfiles "/colors")) (copy-recursively (string-append vifm "/vim") vimfiles) - (delete-file-recursively (string-append vifm "/colors")) (delete-file-recursively (string-append vifm "/vim")))))))) (native-inputs (list groff)) ; for the documentation @@ -986,17 +954,9 @@ a nested nvim process.") (sha256 (base32 "013yn2n2nsspk12bldkc9xn4z4kjx9rvracbllc8i1nngldckxd0")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("compiler" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "guix")) (home-page "https://git.sr.ht/~efraim/guix.vim") (synopsis "Guix integration in Vim") (description "This package provides support for GNU Guix in Vim.") @@ -1015,11 +975,10 @@ a nested nvim process.") (sha256 (base32 "11zcw0sll6qg6ha0rr6n1cw5v73azvf7ycwn9lgiwa5cj7rrqjf4")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("plugin" "share/vim/vimfiles/") - ("doc/" "share/vim/vimfiles/doc" #:include ("asyncrun.txt"))))) + (list + #:plugin-name "asyncrun")) (home-page "https://github.com/skywind3000/asyncrun.vim") (synopsis "Run Async Shell Commands in Vim") (description "This plugin takes the advantage of new APIs in Vim 8 (and @@ -1041,12 +1000,9 @@ quickfix window in realtime.") (sha256 (base32 "1m8b5mn2zqlphzs6xfwykwmghf6p0wabrhpjmh7vav35jgcxc4wl")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "dispatch")) (home-page "https://github.com/tpope/vim-dispatch") (synopsis "Asynchronous build and test dispatcher") (description "Leverage the power of Vim's compiler plugins without being @@ -1071,11 +1027,9 @@ the job completes, errors will be loaded and parsed automatically.") (file-name (git-file-name name version)) (sha256 (base32 "05ffhhfahjqwxyrqmsinsahrs15wknzl2qbj8mznyv319mn2civ2")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - `(#:install-plan - '(("ftdetect" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "gemini")) (home-page "https://git.sr.ht/~torresjrjr/gemini.vim") (synopsis "Vim syntax highlighting plugin for Gemini") (description "This Vim plugin provides a Vim syntax highlighting plugin @@ -1099,11 +1053,9 @@ specification.") (sha256 (base32 "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "eunuch")) (home-page "https://github.com/tpope/vim-eunuch") (synopsis "Vim sugar for the UNIX shell commands") (description "Vim sugar for the UNIX shell commands that need it the most. @@ -1127,13 +1079,9 @@ help working on Vim buffers and the files they reference with one command.") (file-name (git-file-name name version)) (sha256 (base32 "0k4b629jn6xlxyjxdl3cgm06v9dmx967rqnslv5m82c9kscwpyh4")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - `(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-slime")) (home-page "https://technotales.wordpress.com/2007/10/03/like-slime-for-vim/") (synopsis "Vim plugin to give you some slime") (description "SLIME is an Emacs plugin to turn Emacs into a Lisp IDE. You @@ -1159,28 +1107,29 @@ to Lisp.") (sha256 (base32 "1dfc1wyjsgkckrklkzvk4whaz3ahaka59rvm7rc724mabmk83pmp")) (file-name (git-file-name name version)))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("vim/autoload" "share/vim/vimfiles/") - ("vim/doc" "share/vim/vimfiles/") - ("vim/ftplugin" "share/vim/vimfiles/") - ("vim/syntax" "share/vim/vimfiles/") - ("vim/test" "share/vim/vimfiles/") - ;; This is so the Vimscript part of Vlime can find the lisp files. - ("lisp" "share/vim/") - ;; This is so lisp can load Vlime without the Vim part. - ("lisp" "share/common-lisp/source/vlime")) + '(#:plugin-name "vlime" #:phases (modify-phases %standard-phases - ;; Create a symbolic link to the .asd file so that - ;; (asdf:load-system "vlime") finds the system. - (add-after 'install 'link-asd + (add-after 'symlink-files 'install-lisp-files (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/share/common-lisp/systems/")) - (symlink (string-append out "/share/common-lisp/source/vlime/vlime.asd") - (string-append out "/share/common-lisp/systems/vlime.asd")))))))) + (let* ((out (assoc-ref outputs "out")) + (common-lisp (string-append out "/share/common-lisp"))) + ;; Create a symbolic link to the .asd file so that + ;; (asdf:load-system "vlime") finds the system. + (copy-recursively "lisp" (string-append common-lisp "/source/vlime")) + (mkdir-p (string-append common-lisp "/systems/")) + (symlink (string-append common-lisp "/source/vlime/vlime.asd") + (string-append common-lisp "/systems/vlime.asd"))))) + (add-after 'install 'symlink-files + (lambda* (#:key outputs plugin-name mode #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") + "/share/vim/vimfiles/pack/guix/" mode "/" plugin-name) + (for-each (lambda (dir) + (symlink (string-append "./vim/" dir) dir)) + (list "after" "autoload" "doc" "ftplugin" "syntax")))))))) (propagated-inputs (list cl-alexandria cl-slime-swank @@ -1211,11 +1160,9 @@ to aid you in your glorious Common Lisp hacking quest.") (file-name (git-file-name name version)) (sha256 (base32 "07d5s20r0ssd7rir45vy0fqlci44gha1a81rcilgar227f3nw328")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "paredit")) (home-page "https://github.com/kovisoft/paredit") (synopsis "Vim plugin for structured editing of Lisp S-expressions") (description @@ -1237,11 +1184,9 @@ to aid you in your glorious Common Lisp hacking quest.") (file-name (git-file-name name version)) (sha256 (base32 "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "surround")) (home-page "https://github.com/tpope/vim-surround") (synopsis "Vim plugin for easy quoting and parenthesizing") (description @@ -1262,12 +1207,9 @@ change and add such surroundings in pairs.") "/vim-gnupg-v" version ".tar.gz")) (sha256 (base32 "02w8lgyyh7wgxysvmmcf9ja5c06vrbyh3alzvv97x8cfhrp0skn7")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-gnupg")) (home-page "https://www.vim.org/scripts/script.php?script_id=3645") (synopsis "Vim plugin for transparent editing of gpg encrypted files") (description @@ -1293,12 +1235,9 @@ swapfile, and undofile when editing encrypted files to increase security.") (file-name (git-file-name name version)) (sha256 (base32 "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "ctrlp.vim")) (home-page "https://ctrlpvim.github.io/ctrlp.vim/") (synopsis "Fuzzy file, buffer, mru, tag, etc. finder for Vim") (description @@ -1330,12 +1269,9 @@ anything). (file-name (git-file-name name version)) (sha256 (base32 "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "MUcomplete")) (home-page "https://github.com/lifepillar/vim-mucomplete") (synopsis "MUcomplete is a minimalist autocompletion plugin for Vim") (description @@ -1359,12 +1295,9 @@ result is returned.") (file-name (git-file-name name version)) (sha256 (base32 "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "gitgutter")) (synopsis "Vim plugin which shows a git diff in the sign column") (description "A Vim plugin which shows a git diff in the sign column. It shows which @@ -1388,12 +1321,9 @@ buffer.") (file-name (git-file-name name version)) (sha256 (base32 "0ppsbsd696ih40d9f76mdl9sd9y7p2pvm65qmvq4b2zhkv4xbpxz")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "characterize")) (home-page "https://github.com/tpope/vim-characterize") (synopsis "Vim plugin for showing Unicode character metadata") (description @@ -1422,13 +1352,9 @@ additions: (file-name (git-file-name name version)) (sha256 (base32 "1fqfs8msmr6d4kpvxqp14sdjvp5fj52q5w5kz71myzcd4kqzmirp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")) + '(#:plugin-name "tagbar" #:phases (modify-phases %standard-phases (add-after 'unpack 'link-universal-ctags @@ -1463,15 +1389,9 @@ the class they are defined in.") (file-name (git-file-name name version)) (sha256 (base32 "1si8qla86ng8cffbmfrk9gss0i3912yw0f1ph4bsiq0kk837lccp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("lib" "share/vim/vimfiles/") - ("nerdtree_plugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "nerdtree")) (home-page "https://github.com/preservim/nerdtree") (synopsis "Tree explorer plugin for Vim") (description @@ -1493,13 +1413,9 @@ files for reading or editing, and perform basic file system operations.") (file-name (git-file-name name version)) (sha256 (base32 "1ka2rqn7rby55aps3iblh1dcqxm7m7qx72mpkz6y2aaj8mkj0zyd")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - (list - #:install-plan - #~`(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "nerdcommenter")) (home-page "https://github.com/preservim/nerdcommenter") (synopsis "Vim plugin for easy commenting of code") (description diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 95d2a879bc..a6b9990437 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1084,7 +1084,8 @@ drags, snap-to-border support, and virtual desktops.") (add-after 'install 'install-vim-files (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (syntax (string-append out "/share/vim/vimfiles/syntax"))) + (syntax (string-append + out "/share/vim/vimfiles/pack/guix/start/fluxbox/syntax"))) (copy-recursively "3rd/vim/vim/syntax" syntax) #t))) (add-after 'install 'install-xsession -- cgit v1.2.3 From 08a926a6b0323e29d2feb2119cc25e536eef0f2e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:52:20 +0100 Subject: gnu: emacs-org-caldav: Update to 3.0. * gnu/packages/emacs-xyz.scm (emacs-org-caldav): Update to 3.0. Change-Id: Idb8d9a8e1f9613c2c86552373f5c708df5dc1da0 --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dfc959ca0a..880d4bf788 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26174,11 +26174,10 @@ be changed by customizing the appropriate variables.") (license license:gpl3+))) (define-public emacs-org-caldav - (let ((commit "8569941a0a5a9393ba51afc8923fd7b77b73fa7a") - (revision "2")) + (let ((commit "754989ae500b3f576bdb94fe2ef3059f12eaf7d7")) ;version bump (package (name "emacs-org-caldav") - (version (git-version "0.0.0" revision commit)) + (version "3.0") (source (origin (method git-fetch) @@ -26187,7 +26186,7 @@ be changed by customizing the appropriate variables.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g")))) + (base32 "0vx465di6imfxmxxkhd8lsdgywyz3gnindg0fyvb2zshg3zz80bg")))) (build-system emacs-build-system) (arguments ;; Tests require to have two specific calendars on a test server. -- cgit v1.2.3 From 9443cd9959570856a8d8c883e35ac67143862b37 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:55:02 +0100 Subject: gnu: emacs-xr: Update to 1.25. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.25. Change-Id: I7470de1e0ea69afd345b1dbe7cec35275314cc88 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 880d4bf788..845d31dbe0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2954,13 +2954,13 @@ and ease-of-key score. Most frequently used commands have most easy keys.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214")))) + (base32 "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") -- cgit v1.2.3 From 26c148bd9225e61215aab90ca952c183ac8b8f77 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:55:08 +0100 Subject: gnu: emacs-relint: Update to 1.24. * gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.24. Change-Id: Ie7375ac6b87db9221234a073b18d797a5bb239c0 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 845d31dbe0..3d7f071e75 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3117,14 +3117,14 @@ project root.") (define-public emacs-relint (package (name "emacs-relint") - (version "1.23") + (version "1.24") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "relint-" version ".tar")) (sha256 - (base32 "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9")))) + (base32 "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xr)) (home-page "https://github.com/mattiase/relint") -- cgit v1.2.3 From 02f9a4150ad0925a836b2e7c0b2ccaf8c225e10a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:55:16 +0100 Subject: gnu: emacs-bbdb: Update to 3.2.2.4. * gnu/packages/emacs-xyz.scm (emacs-bbdb): Update to 3.2.2.4. Change-Id: I1b3c043bab7a6834cc515a93ae053fef69d8dbf4 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3d7f071e75..3046326e56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3674,14 +3674,14 @@ the @code{Dracula} theme for Emacs and the @code{Gloom} theme for Atom.") (define-public emacs-bbdb (package (name "emacs-bbdb") - (version "3.2.2.2") + (version "3.2.2.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "bbdb-" version ".tar")) (sha256 - (base32 "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf")))) + (base32 "13i8ggknc29sny16rq126q0ssz26m3fam0zpdhlsm05pa8dydd7p")))) (build-system emacs-build-system) (arguments ;; XXX: The following file cannot be byte-compiled, because et requires -- cgit v1.2.3 From b310ca2bae5f0676990998ab96a8a7ea344906e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:55:32 +0100 Subject: gnu: emacs-auctex: Update to 13.2.2. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.2.2. Change-Id: I1cc2d385b14f1a5c2bac90642c4c8a7e0be6a5c3 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3046326e56..8c96af6152 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4170,14 +4170,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.2.1") + (version "13.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm")))) + (base32 "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From c620ac44d037f8d1d47f198654575b9c3f776554 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:56:09 +0100 Subject: gnu: emacs-subed: Update to 1.2.6. * gnu/packages/emacs-xyz.scm (emacs-subed): Update to 1.2.6. Change-Id: Ied1c05299bdf1523221c13d2770bcbfbfdb47ac3 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8c96af6152..1af12f15ee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8683,14 +8683,14 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.4") + (version "1.2.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "05pnjdrf9gq32bayvbd0yvp1lxpwj2xsarcy3s2jjb6zcgm6djyb")))) + "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr")))) (arguments (list #:tests? #t -- cgit v1.2.3 From 14adc3b53fdc5fb09b20e839e00cf9256881e08e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:56:26 +0100 Subject: gnu: emacs-compat: Update to 29.1.4.3. * gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.4.3. Change-Id: Ie6c78b0adde92be3633b6c914a7ce65a9bc6d7fc --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1af12f15ee..cd8f00d318 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9019,14 +9019,14 @@ variables, and so on. The mode also allows you to execute Tup commands.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.4.2") + (version "29.1.4.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g")))) + "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") -- cgit v1.2.3 From c1f7e3e7b5870e38a36f9595a92384acb8bf4412 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:56:33 +0100 Subject: gnu: emacs-debbugs: Update to 0.37. * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.37. Change-Id: I6df1eafb8801197670bb7efb7c2e1839ae741181 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cd8f00d318..4125b290a4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8802,14 +8802,14 @@ by a query, so both a link can refer to several mails.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.36") + (version "0.37") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2")) + (base32 "0xj0sv5d3y88fsbm7yhm0v59mzj1srxayng1hr418v89ky43rxpr")) (patches (search-patches "emacs-debbugs-keep-patch-subject.patch")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) -- cgit v1.2.3 From 024c0996724e025b51289c7aad6db02eba7cbe65 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:56:52 +0100 Subject: gnu: emacs-company: Update to 0.10.2. * gnu/packages/emacs-xyz.scm (emacs-company): Update to 0.10.2. Change-Id: Ia92884da4664d051eeb23c7f245aac8ab5020cfe --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4125b290a4..67bcef58a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9047,14 +9047,14 @@ commands and user options are usually not implemented here.") (define-public emacs-company (package (name "emacs-company") - (version "0.9.13") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "company-" version ".tar")) (sha256 - (base32 "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw")))) + (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9")))) (build-system emacs-build-system) (home-page "https://company-mode.github.io/") (synopsis "Modular text completion framework") -- cgit v1.2.3 From 2d6ebcbcc4e42767d01b3616283017a1316a32a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:56:58 +0100 Subject: gnu: emacs-ivy: Update to 0.14.2. * gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.14.2. Change-Id: I5299af740db0a9ebc80218fe350b9113b67cfa22 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 67bcef58a5..dcffedb23e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12566,16 +12566,16 @@ hydras with one column per group of heads."))) (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar")) (sha256 - (base32 "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv")))) + (base32 "1zjksh0jvxyqhzgwmh9i26gaip6c04q400xckh730r2gjs287pjj")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-hydra)) + (list)) (home-page "https://github.com/abo-abo/swiper") (synopsis "Incremental vertical completion for Emacs") (description -- cgit v1.2.3 From 2d6acc29e8b9e0a58bc68e84262f11514072acc8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:57:05 +0100 Subject: gnu: emacs-counsel: Update to 0.14.2. * gnu/packages/emacs-xyz.scm (emacs-counsel): Update to 0.14.2. Change-Id: I351610c4c91ac634ec8e4dda808937b050bc912e --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dcffedb23e..eadcfe9a8a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12590,17 +12590,17 @@ expression.") (define-public emacs-counsel (package (name "emacs-counsel") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "counsel-" version ".tar")) (sha256 - (base32 "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj")))) + (base32 "13119alyzr2xipk3jra3iawplqkqgvv0gdcm4yd527z592b0s7f0")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-swiper)) + (list emacs-ivy emacs-swiper)) (home-page "https://github.com/abo-abo/swiper") (synopsis "Various completion functions using Ivy") (description -- cgit v1.2.3 From 20fa882f6fa3c71c7cdc2047003707af4cb3bb25 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:57:11 +0100 Subject: gnu: emacs-swiper: Update to 0.14.2. * gnu/packages/emacs-xyz.scm (emacs-swiper): Update to 0.14.2. Change-Id: I58f3c05c455a5f4e5c770f84eec1bf63b1025f85 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eadcfe9a8a..98e0060050 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12668,13 +12668,13 @@ the same name.") (define-public emacs-swiper (package (name "emacs-swiper") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar")) (sha256 - (base32 "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms")))) + (base32 "1x6jnc0nrk68kww12gq6w8nss6ny76xz0fgxf57550bbipx9pa8m")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy)) -- cgit v1.2.3 From dddd1d3557f1d8ad74e012df3892f34e67134d24 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:57:18 +0100 Subject: gnu: emacs-zones: Update to 2023.6.11. * gnu/packages/emacs-xyz.scm (emacs-zones): Update to 2023.6.11. Change-Id: I80ac39d4ac38128d466da9984f89f5b3144eff18 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 98e0060050..252276571e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17335,14 +17335,14 @@ customizable by the user.") (define-public emacs-zones (package (name "emacs-zones") - (version "2019.7.13") + (version "2023.6.11") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "zones-" version ".el")) + "zones-" version ".tar")) (sha256 - (base32 "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1")))) + (base32 "1znz720s9pchc7r9g1mpz9jcnz122bppimmh09g1rn94fh3m6vm3")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/Zones") (synopsis "Define and act on multiple zones of buffer text") -- cgit v1.2.3 From 77b8f58ec07b79cd572565497dbd1219f6295678 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:57:31 +0100 Subject: gnu: emacs-notmuch-indicator: Update to 1.1.0. * gnu/packages/emacs-xyz.scm (emacs-notmuch-indicator): Update to 1.1.0. Change-Id: I1b748d4d63adca3080a9169e0d898a7c6ff0a321 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 252276571e..bcd8f4242d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30544,7 +30544,7 @@ real search.") (define-public emacs-notmuch-indicator (package (name "emacs-notmuch-indicator") - (version "1.0.1") + (version "1.1.0") (home-page "https://git.sr.ht/~protesilaos/notmuch-indicator") (source (origin (method url-fetch) @@ -30553,7 +30553,7 @@ real search.") ".tar")) (sha256 (base32 - "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x")))) + "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573")))) (build-system emacs-build-system) (synopsis "Display a mode line indicator with @code{notmuch-count} output") (description "This package renders an indicator with an email count of the -- cgit v1.2.3 From 55de82d1b38802606e72de520cf070f3d649190d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:57:44 +0100 Subject: gnu: emacs-tramp: Update to 2.6.1.4. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.6.1.4. Change-Id: I59cd68fedca7241c6d9330a03fb3b2e997299bce --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bcd8f4242d..bb278be02d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32044,14 +32044,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.1.3") + (version "2.6.1.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y")))) + (base32 "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From fa8d1a909c4e8d25bb1b9456831cb08e8f6130e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:59:02 +0100 Subject: gnu: emacs-url-http-ntlm: Update to 2.0.5. * gnu/packages/emacs-xyz.scm (emacs-url-http-ntlm): Update to 2.0.5. Change-Id: I16c695c072c5c473224c7014fc192de278708f37 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bb278be02d..1faaa7c780 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32415,14 +32415,14 @@ advice system without dropping support for Emacs<24.4.") (define-public emacs-url-http-ntlm (package (name "emacs-url-http-ntlm") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "url-http-ntlm-" version ".el")) + "url-http-ntlm-" version ".tar")) (sha256 - (base32 "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98")))) + (base32 "0bpjif0c4yzz75v59wsv7hilkpj2gv4kyc0rdk8h3d9hvmlq7791")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ntlm)) (home-page "https://elpa.gnu.org/packages/url-http-ntlm.html") -- cgit v1.2.3 From 15c591dc7f4888d6dacacabae32c4ae7192758ba Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 11:59:51 +0100 Subject: gnu: emacs-buffer-env: Update to 0.5. * gnu/packages/emacs-xyz.scm (emacs-buffer-env): Update to 0.5. Change-Id: I907e5c6e0ce618aefdb2b16d9fef16e60b797ede --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1faaa7c780..6f39795470 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35026,14 +35026,14 @@ example code.") (define-public emacs-buffer-env (package (name "emacs-buffer-env") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/buffer-env-" version ".tar")) (sha256 (base32 - "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z")))) + "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/astoff/buffer-env") -- cgit v1.2.3 From d2ae12d0a1bd542697d006a3516bb64b09312084 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:00:02 +0100 Subject: gnu: emacs-ivy-avy: Update to 0.14.2. * gnu/packages/emacs-xyz.scm (emacs-ivy-avy): Update to 0.14.2. Change-Id: If3818e32fa9db5d796400a56ffc0465ff4665c43 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6f39795470..7d3b85bc4c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37065,7 +37065,7 @@ and preferred services can easily be configured.") (define-public emacs-ivy-avy (package (name "emacs-ivy-avy") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) @@ -37073,7 +37073,7 @@ and preferred services can easily be configured.") "https://elpa.gnu.org/packages/" "ivy-avy-" version ".tar")) (sha256 - (base32 "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9")))) + (base32 "0vdrfn2i078567lklhxfhzq2cjplfpawyq2rzpdpww0fzz6fi426")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-avy)) -- cgit v1.2.3 From f6b542fbab57a82bd592cfec90c6263f06d22355 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:00:10 +0100 Subject: gnu: emacs-ivy-hydra: Update to 0.14.2. * gnu/packages/emacs-xyz.scm (emacs-ivy-hydra): Update to 0.14.2. Change-Id: I1ce77975a479b885f5a931efd3c8b0db52c39ce5 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7d3b85bc4c..73ee1df7da 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37157,7 +37157,7 @@ files, providing syntax highlighting and indentation rules.") (define-public emacs-ivy-hydra (package (name "emacs-ivy-hydra") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) @@ -37165,7 +37165,7 @@ files, providing syntax highlighting and indentation rules.") "https://elpa.gnu.org/packages/" "ivy-hydra-" version ".tar")) (sha256 - (base32 "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n")))) + (base32 "10qav0rvgc5bnlazjiwnv9dlk6hivl4acif0zq2f0qqgld9nh528")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-hydra)) -- cgit v1.2.3 From 3bd8e8d001ba75d34cbf816e4c878844426ada07 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:02:28 +0100 Subject: gnu: emacs-base16-theme: Update to 3.2. * gnu/packages/emacs-xyz.scm (emacs-base16-theme): Update to 3.2. Change-Id: I72824ccb9c17584a2f05ef430ef74219aaa530c7 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 73ee1df7da..6915ddb556 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11517,7 +11517,7 @@ answers.") (define-public emacs-base16-theme (package (name "emacs-base16-theme") - (version "3.1") + (version "3.2") (source (origin (method git-fetch) @@ -11526,7 +11526,7 @@ answers.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0")))) + (base32 "0mdnm6xam1md9yiy6y14yp59j2864brazqszm7vklgb40xpxaxsq")))) (build-system emacs-build-system) (arguments (list #:include #~(cons "^build\\/.*\\.el$" %default-include) -- cgit v1.2.3 From 30586802de4c252ae075ff9996926175b16b659b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:03:14 +0100 Subject: gnu: emacs-citar: Update to 1.4.0. * gnu/packages/emacs-xyz.scm (emacs-citar): Update to 1.4.0. Change-Id: I98e0a753c496e0d67ad864ebc8fd0833926d3347 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6915ddb556..48a3f25615 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23193,7 +23193,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (define-public emacs-citar (package (name "emacs-citar") - (version "1.3.1") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -23202,7 +23202,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (file-name (git-file-name name version)) (sha256 (base32 - "12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy")))) + "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From f6fbe8ec4f357758e698198ef490be4ef62be440 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:05:15 +0100 Subject: gnu: emacs-ebib: Update to 2.39.4. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.39.4. Change-Id: I8486a18bf65ecc7c5050b1c6136026072eda3f47 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48a3f25615..663cb037a4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23137,7 +23137,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.39.3") + (version "2.39.4") (source (origin (method git-fetch) @@ -23146,7 +23146,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc")))) + (base32 "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay")))) (build-system emacs-build-system) (propagated-inputs (list emacs-biblio emacs-ivy emacs-parsebib)) -- cgit v1.2.3 From 1e50e655687b0fcafebf9515e26c12399bab94e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:24:06 +0100 Subject: gnu: emacs-ebuild-mode: Update to 1.69. * gnu/packages/emacs-xyz.scm (emacs-ebuild-mode): Update to 1.69. Change-Id: I5d06c0e8a660da18bb152e8745e3f6901fe8de5a --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 663cb037a4..764140fd32 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15730,7 +15730,7 @@ Lua programming language}.") (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.67") + (version "1.69") (source (origin (method url-fetch) @@ -15739,7 +15739,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "0hbx3vrv2h2vfi45q4mj6z9kqsma530gxjsr5hyd4bj1xnk4gb76")))) + (base32 "1sqyjz4qy07q6wkh89gg4f4s1fk96mv2f99y4rm0sp7gf6bkdj38")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 2e5b62d964d3cd6e17bea78536d520faa3510d7d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:24:51 +0100 Subject: gnu: emacs-ef-themes: Update to 1.4.0. * gnu/packages/emacs-xyz.scm (emacs-ef-themes): Update to 1.4.0. Change-Id: I29cae75d5866091c242302581ae5fbf430ccc17d --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 764140fd32..dc76c67d58 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6584,7 +6584,7 @@ intended to be.") (define-public emacs-ef-themes (package (name "emacs-ef-themes") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -6594,7 +6594,7 @@ intended to be.") (file-name (git-file-name name version)) (sha256 (base32 - "0a52zm9h7nsif5b6ig428d9i0gh8c0qcfyarvsmpv8cwk59iba0z")))) + "029pcca3ppbs22isym2hi3zzynmvk5dg7jcimpm7nd8m4qk46f49")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~protesilaos/ef-themes") (synopsis "Colorful and legible themes") -- cgit v1.2.3 From d5d43ec3e29c2d49474f6fd4e655efa7dd6fc6e9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 12:59:59 +0100 Subject: gnu: emacs-eldev: Update to 1.7. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 1.7. [arguments]<#:phases>: Re-instate one previously failing test. Change-Id: Ie0cef80184f0d117d50eef20512b4aaf22d31ff4 --- gnu/packages/emacs-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dc76c67d58..27c5249bed 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22920,7 +22920,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) @@ -22929,7 +22929,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m2d607hprkl1pdapxsfjwag7plf822ig59qb6jjzy9m7gwg21k5")))) + (base32 "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5")))) (build-system emacs-build-system) (arguments (list @@ -22942,12 +22942,9 @@ according to a parsing expression grammar.") (setenv "ELDEV_LOCAL" (getcwd)) (make-file-writable "test/project-i/project-i-autoloads.el"))) (add-after 'unpack 'skip-failing-tests - ;; FIXME: 3 tests are failing. Skip them for now. + ;; FIXME: 2 tests are failing. Skip them for now. (lambda _ - (delete-file "test/upgrade-self.el") - (substitute* "test/doctor.el" - (("\\(ert-deftest eldev-doctor-up-to-date-copyright-2 .*" all) - (string-append all "(skip-unless nil)\n"))))) + (delete-file "test/upgrade-self.el"))) (add-after 'install 'install-eldev-executable ;; This constructs the eldev executable from templates and ;; installs it in the specified directory. -- cgit v1.2.3 From 38b345006b15d815fa735bf5369457ed07e2ff47 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:01:14 +0100 Subject: gnu: emacs-elfeed-protocol: Update to 0.9.1. * gnu/packages/emacs-xyz.scm (emacs-elfeed-protocol): Update to 0.9.1. Change-Id: Iaac2a6bd8669cb37aee85087ab56b40391fff072 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 27c5249bed..7946bf03f5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14147,7 +14147,7 @@ much easier.") (define-public emacs-elfeed-protocol (package (name "emacs-elfeed-protocol") - (version "0.9.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -14156,7 +14156,7 @@ much easier.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0cgq280gxw40vxn2pvax9k5k22gd1kwsjw4yl35206d3mb9wb0fa")))) + (base32 "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp")))) (build-system emacs-build-system) (propagated-inputs (list emacs-elfeed)) -- cgit v1.2.3 From 37f3ade8a9d5a94c13753c2dc3d1019ffa92f069 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:08:49 +0100 Subject: gnu: emacs-expand-region: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-expand-region): Update to 1.0.0. Change-Id: I04ebab9d22dc7b43590839fa467d05a6f7670c45 --- gnu/packages/emacs-xyz.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7946bf03f5..1f9efceff7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6703,20 +6703,18 @@ mode, which displays information about Elasticsearch clusters.") (license license:gpl3+))) (define-public emacs-expand-region - (let ((commit "c5c4362741deebb0985a8a29f9b8b0e25160764a") - (revision "1")) - (package + (package (name "emacs-expand-region") - (version (git-version "0.11.0" revision commit)) + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/magnars/expand-region.el") - (commit commit))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17h58v5mnggbrwrp61cwkqx8hzazkdqyz9p6s1hl9g2hys7zkb00")))) + (base32 "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6")))) (build-system emacs-build-system) (home-page "https://github.com/magnars/expand-region.el") (synopsis "Increase selected region by semantic units") @@ -6724,7 +6722,7 @@ mode, which displays information about Elasticsearch clusters.") "Expand region increases the selected region by semantic units. Just keep pressing the key until it selects what you want. There's also @code{er/contract-region} if you expand too far.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-explain-pause-mode (let ((commit "2356c8c3639cbeeb9751744dbe737267849b4b51") -- cgit v1.2.3 From 504b85237eea75b624494c848b5bfe9ab3e83dfb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:09:32 +0100 Subject: gnu: emacs-fountain-mode: Update to 3.7.1. * gnu/packages/emacs-xyz.scm (emacs-fountain-mode): Update to 3.7.1. Change-Id: I2a7a1c65e517eb261cf272f2e895d5242801ff5e --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f9efceff7..8ea47cf298 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6258,7 +6258,7 @@ files and directories.") (define-public emacs-fountain-mode (package (name "emacs-fountain-mode") - (version "3.6.3") + (version "3.7.1") (source (origin (method git-fetch) @@ -6267,7 +6267,7 @@ files and directories.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18s1dp2n9q6f3py3f1yc3918yqpncdkwkgi3b3bc2868n6sw0n84")))) + (base32 "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298")))) (arguments (list #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From ffa08b3e5eb0a08101b668b169c735b494dd70fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:10:25 +0100 Subject: gnu: emacs-git-modes: Update to 1.4.2. * gnu/packages/emacs-xyz.scm (emacs-git-modes): Update to 1.4.2. Change-Id: I3d79b4b5a514e133b64c688cf77aee423fed2245 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8ea47cf298..69ec943479 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1355,7 +1355,7 @@ its mode line.") (define-public emacs-git-modes (package (name "emacs-git-modes") - (version "1.4.1") + (version "1.4.2") (source (origin (method git-fetch) @@ -1364,7 +1364,7 @@ its mode line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b9fywqwccdvyg1cfnlzl61gq1gryjvzp32cw91l4igv7ppmq684")))) + (base32 "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) -- cgit v1.2.3 From a43c6fbd167dac2c931e8811e0c212164c1ca11f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:25:15 +0100 Subject: gnu: emacs-jarchive: Update to 0.11.0. * gnu/packages/emacs-xyz.scm (emacs-jarchive): Update to 0.11.0. Change-Id: Ia0b5b5b48cda6127631163980f81979ce77dd980 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 69ec943479..8955bbe1c2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19447,7 +19447,7 @@ more information.") (define-public emacs-jarchive (package (name "emacs-jarchive") - (version "0.10.0") + (version "0.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -19456,7 +19456,7 @@ more information.") (file-name (git-file-name name version)) (sha256 (base32 - "1hddjs4yj03cqppip1gsgmkhp3fmq9ggyf5wxx5k3m78cg7k1bl7")))) + "1v8a2bbjgkn95pxq8x9251znj03m5n0f6bngbf4a63pxa2il3r8n")))) (build-system emacs-build-system) (home-page "https://sr.ht/~dannyfreeman/jarchive") (synopsis "Jarchive teaches Emacs how to navigate to files inside JARs") -- cgit v1.2.3 From b7b2cafa24b9c4c741bbd6905a5e110f263d19c5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:26:11 +0100 Subject: gnu: emacs-olivetti: Update to 2.0.5. * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update to 2.0.5. Change-Id: I016382b6be6f268a1f6f34097e976d00bbf5eec0 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8955bbe1c2..9421752534 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5880,7 +5880,7 @@ or if you want to ensure that some modes have no ligatures at all.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.4") + (version "2.0.5") (source (origin (method git-fetch) @@ -5889,7 +5889,7 @@ or if you want to ensure that some modes have no ligatures at all.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s")))) + (base32 "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1")))) (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 95a60aa4135633d8731f55898dbba299d7c1d390 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Nov 2023 13:26:55 +0100 Subject: gnu: emacs-org: Update to 9.6.11. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.6.11. Change-Id: I159bbb49607631ca9a25fc4dc1bf1bd43a8dc932 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9421752534..28e14803d7 100644 --- a/gnu/packages/em