[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/21: Merge branch 'master' into emacs-team
From: |
guix-commits |
Subject: |
20/21: Merge branch 'master' into emacs-team |
Date: |
Wed, 2 Aug 2023 00:15:23 -0400 (EDT) |
lilyp pushed a commit to branch emacs-team
in repository guix.
commit 8de4131b2ddd11faa3394cf497484563068c9e7a
Merge: 15406013fe 45b7a8bfda
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Tue Aug 1 22:21:09 2023 +0200
Merge branch 'master' into emacs-team
Makefile.am | 3 +
build-aux/cuirass/hurd-manifest.scm | 15 +-
doc/build.scm | 7 +-
doc/contributing.texi | 6 +-
doc/environment-gdb.scm | 2 +-
doc/guix-cookbook.texi | 47 +-
doc/guix.texi | 248 +-
etc/guix-install.sh | 69 +-
etc/teams.scm.in | 29 +-
gnu/bootloader/grub.scm | 20 +-
gnu/build/hurd-boot.scm | 37 +-
gnu/build/marionette.scm | 41 +-
gnu/local.mk | 35 +-
gnu/packages/accessibility.scm | 94 +-
gnu/packages/admin.scm | 82 +-
gnu/packages/adns.scm | 68 +-
gnu/packages/agda.scm | 51 +-
gnu/packages/algebra.scm | 9 +-
gnu/packages/android.scm | 33 +-
gnu/packages/anthy.scm | 22 +-
gnu/packages/aspell.scm | 2 +-
gnu/packages/assembly.scm | 45 +-
gnu/packages/astronomy.scm | 91 +-
gnu/packages/audio.scm | 81 +-
gnu/packages/authentication.scm | 16 +-
gnu/packages/autotools.scm | 1 -
gnu/packages/aux-files/linux-libre/6.4-arm.conf | 10777 +++++
gnu/packages/aux-files/linux-libre/6.4-arm64.conf | 11406 +++++
gnu/packages/aux-files/linux-libre/6.4-i686.conf | 11652 +++++
gnu/packages/aux-files/linux-libre/6.4-x86_64.conf | 11837 +++++
gnu/packages/backup.scm | 16 +-
gnu/packages/base.scm | 152 +-
gnu/packages/bioconductor.scm | 1027 +-
gnu/packages/bioinformatics.scm | 231 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootloaders.scm | 97 +-
gnu/packages/build-tools.scm | 6 +-
gnu/packages/ccache.scm | 4 +-
gnu/packages/cdrom.scm | 53 +-
gnu/packages/check.scm | 36 +
gnu/packages/chemistry.scm | 17 +-
gnu/packages/chez.scm | 42 +-
gnu/packages/chromium.scm | 2 +-
gnu/packages/cmake.scm | 48 +-
gnu/packages/cobol.scm | 6 +-
gnu/packages/commencement.scm | 442 +-
gnu/packages/compression.scm | 62 +-
gnu/packages/cpp.scm | 25 +-
gnu/packages/cran.scm | 351 +-
gnu/packages/cross-base.scm | 55 +-
gnu/packages/crypto.scm | 40 +-
gnu/packages/cups.scm | 10 +-
gnu/packages/curl.scm | 33 +-
gnu/packages/databases.scm | 179 +-
gnu/packages/dav.scm | 40 +-
gnu/packages/dictionaries.scm | 17 +-
gnu/packages/diffoscope.scm | 114 +-
gnu/packages/disk.scm | 38 +-
gnu/packages/dns.scm | 245 +-
gnu/packages/docbook.scm | 34 +-
gnu/packages/documentation.scm | 12 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/elf.scm | 23 +
gnu/packages/emacs-xyz.scm | 599 +-
gnu/packages/emacs.scm | 4 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/engineering.scm | 64 +-
gnu/packages/file-systems.scm | 196 +-
gnu/packages/finance.scm | 2 +-
gnu/packages/firmware.scm | 33 +-
gnu/packages/flashing-tools.scm | 59 +-
gnu/packages/fonts.scm | 27 +-
gnu/packages/fontutils.scm | 133 +-
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/fsf.scm | 16 +-
gnu/packages/game-development.scm | 270 +-
gnu/packages/games.scm | 654 +-
gnu/packages/gettext.scm | 20 +-
gnu/packages/ghostscript.scm | 28 +-
gnu/packages/gl.scm | 15 +-
gnu/packages/glib.scm | 104 +-
gnu/packages/gnome-xyz.scm | 4 +-
gnu/packages/gnome.scm | 61 +-
gnu/packages/gnucash.scm | 28 +-
gnu/packages/gnupg.scm | 92 +-
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/graphics.scm | 20 +-
gnu/packages/graphviz.scm | 24 +-
gnu/packages/gtk.scm | 63 +-
gnu/packages/guile-xyz.scm | 13 +-
gnu/packages/guile.scm | 51 +-
gnu/packages/hardware.scm | 163 +-
gnu/packages/haskell-apps.scm | 2 +-
gnu/packages/haskell-crypto.scm | 56 +-
gnu/packages/haskell-xyz.scm | 155 +-
gnu/packages/haskell.scm | 5 +-
gnu/packages/high-availability.scm | 13 +-
gnu/packages/hurd.scm | 434 +-
gnu/packages/ibus.scm | 12 +-
gnu/packages/image-processing.scm | 80 +-
gnu/packages/image.scm | 7 +-
gnu/packages/installers.scm | 4 +-
gnu/packages/irc.scm | 54 +-
gnu/packages/java.scm | 21 +
gnu/packages/kde.scm | 2 +-
gnu/packages/less.scm | 6 +-
gnu/packages/libbsd.scm | 16 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/libunistring.scm | 8 +-
gnu/packages/libusb.scm | 9 +-
gnu/packages/linux.scm | 583 +-
gnu/packages/lisp-check.scm | 46 +-
gnu/packages/lisp-xyz.scm | 45 +-
gnu/packages/lisp.scm | 2 +-
gnu/packages/llvm.scm | 7 +-
gnu/packages/m4.scm | 12 +-
gnu/packages/machine-learning.scm | 37 +-
gnu/packages/mail.scm | 102 +-
gnu/packages/mastodon.scm | 9 +-
gnu/packages/mate.scm | 146 +-
gnu/packages/maths.scm | 263 +-
gnu/packages/mingw.scm | 8 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/multiprecision.scm | 12 +
gnu/packages/music.scm | 77 +-
gnu/packages/networking.scm | 144 +-
gnu/packages/node.scm | 44 +-
gnu/packages/nss.scm | 11 +-
gnu/packages/ntp.scm | 65 +-
gnu/packages/ocaml.scm | 33 +-
gnu/packages/package-management.scm | 244 +-
gnu/packages/password-utils.scm | 32 +-
.../patches/arpack-ng-propagate-rng-state.patch | 523 +
gnu/packages/patches/biber-adapt-perl-5.36.patch | 40 -
.../patches/curlftpfs-fix-error-closing-file.patch | 23 +
.../patches/curlftpfs-fix-file-names.patch | 76 +
.../patches/curlftpfs-fix-memory-leak.patch | 23 +
.../patches/curlftpfs-fix-no_verify_hostname.patch | 27 +
gnu/packages/patches/doxygen-hurd.patch | 30 +
gnu/packages/patches/fontforge-hurd.patch | 82 +
.../patches/ghostscript-CVE-2023-36664-fixup.patch | 56 +
.../patches/ghostscript-CVE-2023-36664.patch | 142 +
.../patches/ghostscript-leptonica-hurd.patch | 78 +
.../glibc-2.37-hurd-clock_t_centiseconds.patch | 61 +
...c-2.37-hurd-local-clock_gettime_MONOTONIC.patch | 135 +
.../patches/glibc-2.37-versioned-locpath.patch | 264 +
...missing-const_mach_port_name_array_t-type.patch | 32 -
gnu/packages/patches/gnumach-support-noide.patch | 25 +
gnu/packages/patches/hurd-fix-rumpdisk-build.patch | 41 +
gnu/packages/patches/hurd-rumpdisk-no-hd.patch | 26 +
.../patches/kitty-fix-wayland-protocols.patch | 37 +
.../patches/libmateweather-use-TZDIR.patch | 42 +
.../linux-libre-wireguard-postup-privkey.patch | 119 +
gnu/packages/patches/lvm2-static-link.patch | 36 -
gnu/packages/patches/mactelnet-remove-init.patch | 98 +
gnu/packages/patches/mig-cpu.h-generation.patch | 16 -
.../patches/mutter-fix-inverted-test.patch | 290 +
gnu/packages/patches/netdde-build-fix.patch | 28 +
.../patches/oath-toolkit-xmlsec-compat.patch | 79 -
.../patches/qxlsx-fix-include-directory.patch | 24 +
.../patches/racket-rktboot-riscv64-support.patch | 15 +
gnu/packages/patches/sssd-system-directories.patch | 19 +-
.../patches/texlive-hyph-utf8-no-byebug.patch | 13 -
.../patches/u-boot-allow-disabling-openssl.patch | 13 +-
.../patches/u-boot-fix-u-boot-lib-build.patch | 24 +
gnu/packages/patches/u-boot-infodocs-target.patch | 84 -
.../patches/u-boot-patman-guix-integration.patch | 1244 -
.../u-boot-sifive-prevent-reloc-initrd-fdt.patch | 8 +-
gnu/packages/patches/zig-0.9-riscv-support.patch | 47 +
gnu/packages/pdf.scm | 17 +-
gnu/packages/perl-check.scm | 24 +
gnu/packages/perl.scm | 107 +-
gnu/packages/photo.scm | 10 +-
gnu/packages/plotutils.scm | 20 +-
gnu/packages/purescript.scm | 19 +-
gnu/packages/pv.scm | 4 +-
gnu/packages/python-compression.scm | 34 +-
gnu/packages/python-science.scm | 129 +-
gnu/packages/python-web.scm | 91 +-
gnu/packages/python-xyz.scm | 283 +-
gnu/packages/python.scm | 27 +-
gnu/packages/qt.scm | 7 +-
gnu/packages/racket.scm | 45 +-
gnu/packages/radio.scm | 112 +-
gnu/packages/raspberry-pi.scm | 4 +-
gnu/packages/ruby.scm | 9 +-
gnu/packages/samba.scm | 30 +-
gnu/packages/scheme.scm | 5 +-
gnu/packages/screen.scm | 25 +-
gnu/packages/sdl.scm | 15 +-
gnu/packages/security-token.scm | 101 +-
gnu/packages/serialization.scm | 13 +-
gnu/packages/shells.scm | 13 +-
gnu/packages/shellutils.scm | 5 +-
gnu/packages/simulation.scm | 6 +-
gnu/packages/sourcehut.scm | 112 +
gnu/packages/sphinx.scm | 35 +-
gnu/packages/spice.scm | 26 +-
gnu/packages/ssh.scm | 158 +-
gnu/packages/sssd.scm | 6 +-
gnu/packages/statistics.scm | 76 +-
gnu/packages/storage.scm | 2 +-
gnu/packages/swig.scm | 6 +-
gnu/packages/sync.scm | 2 +-
gnu/packages/tcl.scm | 10 +-
gnu/packages/terminals.scm | 206 +-
gnu/packages/tex.scm | 46636 ++++++++++++++-----
gnu/packages/text-editors.scm | 4 +-
gnu/packages/textutils.scm | 7 +-
gnu/packages/tls.scm | 17 +-
gnu/packages/tree-sitter.scm | 11 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/version-control.scm | 21 +-
gnu/packages/video.scm | 169 +-
gnu/packages/virtualization.scm | 122 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 116 +-
gnu/packages/wm.scm | 35 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 22 +-
gnu/packages/xorg.scm | 17 +
gnu/packages/zig.scm | 22 +-
gnu/services/audio.scm | 284 +-
gnu/services/base.scm | 9 +-
gnu/services/guix.scm | 6 +-
gnu/services/herd.scm | 52 +-
gnu/services/virtualization.scm | 4 +-
gnu/services/vpn.scm | 268 +-
gnu/system.scm | 27 +-
gnu/system/accounts.scm | 3 +-
gnu/system/examples/bare-hurd.tmpl | 4 +-
gnu/system/hurd.scm | 4 +-
gnu/tests/gdm.scm | 20 +-
gnu/tests/lightdm.scm | 3 +-
gnu/tests/vnc.scm | 74 +-
guix/build-system/gnu.scm | 6 +-
guix/build-system/texlive.scm | 28 +-
guix/build/download-nar.scm | 33 +-
guix/build/pack.scm | 111 +-
guix/build/texlive-build-system.scm | 265 +-
guix/download.scm | 10 +-
guix/import/texlive.scm | 328 +-
guix/import/utils.scm | 17 +-
guix/licenses.scm | 15 +
guix/lint.scm | 1 +
guix/platform.scm | 12 +-
guix/profiles.scm | 52 +-
guix/scripts/pack.scm | 355 +-
guix/scripts/refresh.scm | 6 +-
guix/scripts/shell.scm | 4 +-
guix/scripts/system.scm | 2 -
guix/svn-download.scm | 119 +-
guix/transformations.scm | 46 +-
po/doc/guix-manual.de.po | 23836 +++++-----
po/doc/guix-manual.fr.po | 23633 +++++-----
po/guix/bn.po | 9 +-
po/guix/cs.po | 10 +-
po/guix/da.po | 19 +-
po/guix/de.po | 205 +-
po/guix/es.po | 7 +-
po/guix/fa.po | 9 +-
po/guix/fr.po | 7 +-
po/guix/it.po | 13 +-
po/guix/ja.po | 96 +-
po/guix/ka.po | 17 +-
po/guix/nl.po | 7 +-
po/guix/pl.po | 9 +-
po/guix/pt_BR.po | 7 +-
po/guix/ru.po | 9 +-
po/guix/sk.po | 9 +-
po/guix/ta.po | 29 +-
po/guix/tr.po | 423 +-
po/guix/uk.po | 11 +-
po/packages/tr.po | 82 +-
tests/import-utils.scm | 10 +-
tests/pack.scm | 307 +-
tests/services/vpn.scm | 85 +
tests/texlive.scm | 639 +-
278 files changed, 117691 insertions(+), 42756 deletions(-)
diff --cc gnu/packages/emacs.scm
index 638c2f7c4e,d3689c2474..d90f7ccb84
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -282,136 -368,103 +282,136 @@@ languages."
(search-path-specification
(variable "INFOPATH")
(files '("share/info")))
- ;; tree-sitter support is not yet available in emacs 28, but this
- ;; search path won't harm and also will be beneficial for
- ;; emacs-next and other emacs-* packages, which have tree-sitter
- ;; support enabled. Please, remove this comment, when emacs
- ;; package is updated to 29.
+ ;; Most variants support tree-sitter, so let's include it here.
(search-path-specification
(variable "TREE_SITTER_GRAMMAR_PATH")
- (files '("lib/tree-sitter")))))
-
- (home-page "https://www.gnu.org/software/emacs/")
- (synopsis "The extensible, customizable, self-documenting text editor")
- (description
- "GNU Emacs is an extensible and highly customizable text editor. It is
-based on an Emacs Lisp interpreter with extensions for text editing. Emacs
-has been extended in essentially all areas of computing, giving rise to a
-vast array of packages supporting, e.g., email, IRC and XMPP messaging,
-spreadsheets, remote server editing, and much more. Emacs includes extensive
-documentation on all aspects of the system, from basic editing to writing
-large Lisp programs. It has full Unicode support for nearly all human
-languages.")
- (license license:gpl3+)))
+ (files '("lib/tree-sitter")))))))
-(define-public emacs-next
- (package
- (inherit emacs)
- (name "emacs-next")
- (version "29.0.92")
- (source
- (origin
- (inherit (package-source emacs))
- (method git-fetch)
- (uri (git-reference
- (url "https://git.savannah.gnu.org/git/emacs.git/")
- (commit (string-append "emacs-" version))))
- (file-name (git-file-name name version))
- ;; emacs-source-date-epoch.patch is no longer necessary
- (patches (search-patches "emacs-exec-path.patch"
- "emacs-fix-scheme-indent-function.patch"
- "emacs-native-comp-driver-options.patch"))
- (sha256
- (base32
- "1h3p325859svcy43iv7wr27dp68049j9d44jq5akcynqdkxz4jjn"))))
+(define-public emacs-no-x
+ (package/inherit emacs-minimal
+ (name "emacs-no-x")
+ (synopsis "The extensible, customizable, self-documenting text
+editor (console only)")
+ (arguments
+ (substitute-keyword-arguments (package-arguments emacs-minimal)
+ ((#:configure-flags flags #~'())
+ #~(cons* "--with-modules" "--with-native-compilation=aot"
+ (delete "--with-gnutls=no" #$flags)))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'set-paths 'set-libgccjit-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (first-subdirectory/absolute directory)
+ (let ((files (scandir
+ directory
+ (lambda (file)
+ (and (not (member file '("." "..")))
+ (file-is-directory? (string-append
+ directory "/"
+ file)))))))
+ (and (not (null? files))
+ (string-append directory "/" (car files)))))
+ (let* ((libgccjit-libdir
+ (first-subdirectory/absolute ;; version
+ (first-subdirectory/absolute ;; host type
+ (search-input-directory inputs "lib/gcc")))))
+ (setenv "LIBRARY_PATH"
+ (string-append (getenv "LIBRARY_PATH")
+ ":" libgccjit-libdir)))))
+ (add-after 'unpack 'patch-compilation-driver
+ (lambda _
+ (substitute* "lisp/emacs-lisp/comp.el"
+ (("\\(defcustom native-comp-driver-options nil")
+ (format
+ #f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
+ (string-append
+ "-B" #$(this-package-input "binutils") "/bin/")
+ (string-append
+ "-B" #$(this-package-input "glibc") "/lib/")
+ (string-append
+ "-B" #$(this-package-input "libgccjit") "/lib/")
+ (string-append
+ "-B" #$(this-package-input "libgccjit")
"/lib/gcc/"))))))))))
(inputs
- (modify-inputs (package-inputs emacs)
- (prepend sqlite)))
- (native-inputs
- (modify-inputs (package-native-inputs emacs)
- (prepend autoconf)))))
+ (modify-inputs (package-inputs emacs-minimal)
+ (prepend gnutls
+ ;; To "unshadow" ld-wrapper in native builds
+ (make-ld-wrapper "ld-wrapper" #:binutils binutils)
+ ;; For native compilation
+ binutils
- glibc
++ (libc-for-target)
+ libgccjit
-(define-public emacs-next-tree-sitter
- (package
- (inherit emacs-next)
- (name "emacs-next-tree-sitter")
- (inputs
- (modify-inputs (package-inputs emacs-next)
- (prepend sqlite tree-sitter)))
- (synopsis "Emacs text editor with @code{tree-sitter} support")
- (description "This Emacs build supports tree-sitter.")))
+ ;; Avoid Emacs's limited movemail substitute that retrieves
POP3
+ ;; email only via insecure channels.
+ ;; This is not needed for (modern) IMAP.
+ mailutils
-(define-public emacs-next-pgtk
- (package
- (inherit emacs-next-tree-sitter)
- (name "emacs-next-pgtk")
- (source
- (origin
- (inherit (package-source emacs-next-tree-sitter))
- (patches
- (append (search-patches "emacs-pgtk-super-key-fix.patch")
- (origin-patches (package-source emacs-next-tree-sitter))))))
- (arguments
- (substitute-keyword-arguments (package-arguments emacs-next-tree-sitter)
- ((#:configure-flags flags #~'())
- #~(cons* "--with-pgtk" #$flags))))
- (synopsis "Emacs text editor with @code{pgtk} and @code{tree-sitter}
support")
- (description "This Emacs build implements graphical UI purely in terms
-of GTK and supports tree-sitter.")))
+ acl
+ alsa-lib
+ elogind
+ ghostscript
+ gpm
+ jansson
+ lcms
+ libice
+ libselinux
+ libsm
+ libxml2
+ m17n-lib
+ sqlite
+ tree-sitter
+ zlib)))))
-(define-public emacs-next-pgtk-xwidgets
- (package
- (inherit emacs-next-pgtk)
- (name "emacs-next-pgtk-xwidgets")
- (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk}
support")
+(define-public emacs
+ (package/inherit emacs-no-x
+ (name "emacs")
+ (synopsis "The extensible, customizable, self-documenting text editor")
+ (build-system glib-or-gtk-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments emacs-next-pgtk)
+ (substitute-keyword-arguments (package-arguments emacs-no-x)
+ ((#:modules _) (%emacs-modules build-system))
((#:configure-flags flags #~'())
- #~(cons "--with-xwidgets" #$flags))))
- (inputs
- (modify-inputs (package-inputs emacs-next-pgtk)
- (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
+ #~(cons* "--with-cairo" #$flags))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ ;; Note: due to the changed #:modules, %standard-phases in
#$phases
+ ;; refers to glib-or-gtk:%standard-phases, so we don't need to add
+ ;; them ourselves.
+ (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+ ;; Restore the dump file that Emacs installs somewhere in
+ ;; libexec/ to its original state.
+ (lambda* (#:key outputs target #:allow-other-keys)
+ (let* ((libexec (string-append (assoc-ref outputs "out")
+ "/libexec"))
+ ;; each of these ought to only match a single file,
+ ;; but even if not (find-files) sorts by string<,
+ ;; so the Nth element in one maps to the Nth element of
+ ;; the other
+ (pdmp (find-files libexec "\\.pdmp$"))
+ (pdmp-real (find-files libexec "\\.pdmp-real$")))
+ (for-each rename-file pdmp-real pdmp))))))))
+ (inputs (modify-inputs (package-inputs emacs-no-x)
+ (prepend
+ cairo
+ dbus
+ gtk+
+ giflib
+ harfbuzz
+ libjpeg-turbo
+ libotf
+ libpng
+ (librsvg-for-system)
+ libtiff
+ libx11
+ libxft
+ libxpm
+ pango
+ poppler)))))
-(define-public emacs-minimal
- ;; This is the version that you should use as an input to packages that just
- ;; need to byte-compile .el files.
+(define-public emacs-pgtk
(package/inherit emacs
- (name "emacs-minimal")
- (synopsis "The extensible text editor (used only for byte-compilation)")
- (build-system gnu-build-system)
+ (name "emacs-pgtk")
(arguments
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags #~'())
- 15/21: licenses: Add Arphic-1999 (Aprhic Public License)., (continued)
- 15/21: licenses: Add Arphic-1999 (Aprhic Public License)., guix-commits, 2023/08/02
- 16/21: gnu: vte-ng: Remove package., guix-commits, 2023/08/02
- 19/21: gnu: Add python-asyncua., guix-commits, 2023/08/02
- 05/21: gnu: Add python-core-sr-ht., guix-commits, 2023/08/02
- 06/21: gnu: Add python-scm-sr-ht., guix-commits, 2023/08/02
- 11/21: gnu: xfce4-settings: Update to 4.18.3., guix-commits, 2023/08/02
- 12/21: gnu: xfce4-volumed-pulse: Update to 0.2.4., guix-commits, 2023/08/02
- 17/21: gnu: Add python-baltica., guix-commits, 2023/08/02
- 21/21: gnu: emacs-jsdoc: Use regular emacs., guix-commits, 2023/08/02
- 18/21: gnu: icecat: Update to 102.14.0-guix0-preview1 [security fixes]., guix-commits, 2023/08/02
- 20/21: Merge branch 'master' into emacs-team,
guix-commits <=