[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into emacs-team
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into emacs-team |
|
Date: |
Thu, 13 Jul 2023 12:19:35 -0400 (EDT) |
lilyp pushed a commit to branch emacs-team
in repository guix.
commit 15406013fe63f2ab238eec2d7a8adbc586806ac8
Merge: a3ac317ab4 dd4c199210
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Thu Jul 13 17:21:32 2023 +0200
Merge branch 'master' into emacs-team
.guix-authorizations | 2 -
Makefile.am | 2 +
doc/contributing.texi | 144 +-
doc/guix.texi | 440 +-
etc/guix-install.sh | 3 +-
etc/news.scm | 49 +
gnu/bootloader/u-boot.scm | 17 +
gnu/build/image.scm | 11 +
gnu/home/services.scm | 53 +-
gnu/home/services/desktop.scm | 12 +-
gnu/home/services/mcron.scm | 8 +-
gnu/home/services/pm.scm | 8 +-
gnu/home/services/shells.scm | 162 +-
gnu/home/services/shepherd.scm | 9 +-
gnu/home/services/ssh.scm | 124 +-
gnu/home/services/xdg.scm | 36 +-
gnu/installer/services.scm | 19 +-
gnu/local.mk | 30 +-
gnu/packages/acl.scm | 8 +-
gnu/packages/admin.scm | 160 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/animation.scm | 5 +-
gnu/packages/assembly.scm | 31 +
gnu/packages/astronomy.scm | 999 +-
gnu/packages/attr.scm | 7 +-
gnu/packages/audio.scm | 73 +-
gnu/packages/authentication.scm | 25 +
gnu/packages/backup.scm | 6 +-
gnu/packages/base.scm | 44 +-
gnu/packages/bash.scm | 19 +-
gnu/packages/bioconductor.scm | 309 +-
gnu/packages/bioinformatics.scm | 412 +-
gnu/packages/bittorrent.scm | 83 +-
gnu/packages/bootloaders.scm | 13 +-
gnu/packages/bootstrap.scm | 1 +
gnu/packages/build-tools.scm | 26 +-
gnu/packages/c.scm | 42 +
gnu/packages/calendar.scm | 21 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/check.scm | 150 +-
gnu/packages/ci.scm | 2 +-
gnu/packages/cinnamon.scm | 1 +
gnu/packages/cmake.scm | 3 +-
gnu/packages/commencement.scm | 12 +-
gnu/packages/compression.scm | 8 +-
gnu/packages/configuration-management.scm | 2 +-
gnu/packages/containers.scm | 2 +
gnu/packages/cpp.scm | 191 +-
gnu/packages/cran.scm | 1111 +-
gnu/packages/crates-io.scm | 6 +-
gnu/packages/crypto.scm | 70 +-
gnu/packages/cups.scm | 39 +-
gnu/packages/databases.scm | 40 +-
gnu/packages/debian.scm | 103 +-
gnu/packages/debug.scm | 6 +-
gnu/packages/dezyne.scm | 5 +-
gnu/packages/disk.scm | 83 +-
gnu/packages/display-managers.scm | 5 +-
gnu/packages/distributed.scm | 26 +-
gnu/packages/dns.scm | 72 +-
gnu/packages/docker.scm | 29 +-
gnu/packages/documentation.scm | 4 +-
gnu/packages/education.scm | 12 +-
gnu/packages/emacs-xyz.scm | 906 +-
gnu/packages/emacs.scm | 4 +-
gnu/packages/embedded.scm | 8 +-
gnu/packages/emulators.scm | 8 +-
gnu/packages/engineering.scm | 12 +-
gnu/packages/erlang.scm | 8 +-
gnu/packages/file-systems.scm | 12 +-
gnu/packages/finance.scm | 53 +-
gnu/packages/firmware.scm | 108 +-
gnu/packages/fonts.scm | 94 +
gnu/packages/fontutils.scm | 27 +
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 22 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/fvwm.scm | 4 +-
gnu/packages/game-development.scm | 54 +-
gnu/packages/games.scm | 263 +-
gnu/packages/gcc.scm | 5 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/geo.scm | 138 +-
gnu/packages/gettext.scm | 7 +-
gnu/packages/gnome-xyz.scm | 63 +-
gnu/packages/gnome.scm | 50 +-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnuzilla.scm | 20 +-
gnu/packages/golang.scm | 300 +-
gnu/packages/gps.scm | 3 +-
gnu/packages/graph.scm | 15 +-
gnu/packages/graphics.scm | 73 +-
gnu/packages/groff.scm | 49 +-
gnu/packages/gstreamer.scm | 8 +
gnu/packages/guile-xyz.scm | 209 +-
gnu/packages/guile.scm | 13 +-
gnu/packages/hardware.scm | 40 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/haskell-check.scm | 24 +
gnu/packages/haskell-xyz.scm | 451 +
gnu/packages/hunspell.scm | 2 +-
gnu/packages/hurd.scm | 15 +-
gnu/packages/ibus.scm | 38 +-
gnu/packages/image-processing.scm | 73 +-
gnu/packages/image-viewers.scm | 8 +-
gnu/packages/image.scm | 79 +-
gnu/packages/instrumentation.scm | 105 +-
gnu/packages/irc.scm | 7 +-
gnu/packages/java.scm | 40 +-
gnu/packages/javascript.scm | 4 +-
gnu/packages/kde-frameworks.scm | 4 +-
gnu/packages/kde-plasma.scm | 4 +-
gnu/packages/kde.scm | 4 +-
gnu/packages/libreoffice.scm | 42 +-
gnu/packages/linux.scm | 256 +-
gnu/packages/lisp-check.scm | 45 +-
gnu/packages/lisp-xyz.scm | 73 +-
gnu/packages/lisp.scm | 18 +-
gnu/packages/llvm.scm | 9 +-
gnu/packages/machine-learning.scm | 276 +-
gnu/packages/mail.scm | 228 +-
gnu/packages/make-bootstrap.scm | 4 +-
gnu/packages/mastodon.scm | 77 +-
gnu/packages/maths.scm | 23 +-
gnu/packages/matrix.scm | 16 +-
gnu/packages/maven.scm | 21 -
gnu/packages/messaging.scm | 4 +-
gnu/packages/monitoring.scm | 8 +-
gnu/packages/mpd.scm | 15 +-
gnu/packages/mpi.scm | 4 +-
gnu/packages/music.scm | 182 +-
gnu/packages/networking.scm | 41 +-
gnu/packages/package-management.scm | 56 +-
gnu/packages/pantheon.scm | 25 +
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 180 +-
.../patches/dezyne-add-missing-shebangs.patch | 61 -
.../directfb-davinci-glibc-228-compat.patch | 41 +
.../patches/dyninst-fix-glibc-compatibility.patch | 33 +
.../patches/fuzzylite-relative-path-in-tests.patch | 15 +
.../patches/fuzzylite-soften-float-equality.patch | 30 +
gnu/packages/patches/fuzzylite-use-catch2.patch | 184 +
gnu/packages/patches/git-header-cmd.patch | 287 -
.../glibc-2.33-riscv64-miscompilation.patch | 57 +
.../patches/guile-fibers-libevent-32-bit.patch | 18 +
gnu/packages/patches/ibus-anthy-fix-tests.patch | 49 +
.../patches/igt-gpu-tools-Use-libproc2.patch | 505 +
.../patches/jbr-17-xcursor-no-dynamic.patch | 72 +
.../patches/libtree-fix-check-non-x86.patch | 50 +
gnu/packages/patches/lightdm-vnc-ipv6.patch | 48 +
...llvm-roc-4.0.0-remove-isystem-usr-include.patch | 29 -
gnu/packages/patches/llvm-roc-5.0.0-linkdl.patch | 15 -
.../patches/maven-generate-component-xml.patch | 3 +-
.../maven-generate-javax-inject-named.patch | 3 +-
gnu/packages/patches/nix-dont-build-html-doc.diff | 33 +-
.../patches/openrgb-unbundle-hueplusplus.patch | 10 +-
.../patches/python-keras-integration-test.patch | 19 -
...python-vega-datasets-remove-la-riots-code.patch | 89 +
.../patches/quodlibet-fix-invalid-glob.patch | 89 +
.../patches/quodlibet-fix-mtime-tests.patch | 39 +
.../patches/rocclr-5.6.0-enable-gfx800.patch | 16 +
.../rocm-bandwidth-test-5.5.0-fix-includes.patch | 79 +
.../patches/rocm-comgr-3.1.0-dependencies.patch | 33 +-
.../patches/rocm-opencl-runtime-4.3-noclinfo.patch | 26 +-
.../patches/rocm-opencl-runtime-4.3-noopencl.patch | 70 -
gnu/packages/patches/ruby-nokogiri.patch | 29 +
.../patches/vcmi-disable-privacy-breach.patch | 21 +
gnu/packages/patchutils.scm | 4 +-
gnu/packages/pciutils.scm | 5 +-
gnu/packages/pdf.scm | 36 +-
gnu/packages/perl.scm | 6 +-
gnu/packages/photo.scm | 17 +-
gnu/packages/php.scm | 4 +-
gnu/packages/plan9.scm | 113 +
gnu/packages/potassco.scm | 27 +-
gnu/packages/pretty-print.scm | 34 +-
gnu/packages/protobuf.scm | 78 +-
gnu/packages/purescript.scm | 7 +-
gnu/packages/python-check.scm | 21 +-
gnu/packages/python-compression.scm | 8 +-
gnu/packages/python-crypto.scm | 7 +-
gnu/packages/python-science.scm | 176 +-
gnu/packages/python-web.scm | 50 +-
gnu/packages/python-xyz.scm | 526 +-
gnu/packages/python.scm | 9 +-
gnu/packages/qt.scm | 4 +-
gnu/packages/radio.scm | 12 +-
gnu/packages/rails.scm | 85 +-
gnu/packages/rocm.scm | 101 +-
gnu/packages/ruby.scm | 2657 +-
gnu/packages/scheme.scm | 6 +
gnu/packages/serialization.scm | 59 +
gnu/packages/shells.scm | 6 +-
gnu/packages/shellutils.scm | 39 +-
gnu/packages/simulation.scm | 398 +-
gnu/packages/spreadsheet.scm | 41 +-
gnu/packages/ssh.scm | 11 +-
gnu/packages/statistics.scm | 317 +-
gnu/packages/sync.scm | 32 +-
gnu/packages/terminals.scm | 59 +-
gnu/packages/tex.scm | 182 +-
gnu/packages/texinfo.scm | 5 +-
gnu/packages/text-editors.scm | 89 +-
gnu/packages/textutils.scm | 30 +-
gnu/packages/time.scm | 2 +-
gnu/packages/tls.scm | 30 +-
gnu/packages/toolkits.scm | 62 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/tree-sitter.scm | 76 +
gnu/packages/version-control.scm | 24 +-
gnu/packages/video.scm | 101 +-
gnu/packages/vim.scm | 18 +-
gnu/packages/virtualization.scm | 97 +-
gnu/packages/web-browsers.scm | 73 +-
gnu/packages/web.scm | 195 +-
gnu/packages/webkit.scm | 9 +-
gnu/packages/wm.scm | 136 +-
gnu/packages/xdisorg.scm | 109 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 204 +-
gnu/services/base.scm | 8 +-
gnu/services/certbot.scm | 32 +-
gnu/services/cgit.scm | 5 +-
gnu/services/desktop.scm | 15 +-
gnu/services/dict.scm | 15 +-
gnu/services/shepherd.scm | 18 +-
gnu/services/virtualization.scm | 8 +-
gnu/services/web.scm | 8 +
gnu/system/hurd.scm | 2 +-
gnu/system/image.scm | 16 +-
gnu/system/images/unmatched.scm | 102 +
gnu/system/linux-container.scm | 13 +-
gnu/system/uuid.scm | 2 +-
gnu/tests/image.scm | 23 +-
gnu/tests/lightdm.scm | 6 +-
guix/avahi.scm | 30 +-
guix/build-system/texlive.scm | 4 +-
guix/build/git.scm | 2 +-
guix/build/node-build-system.scm | 3 +-
guix/build/svn.scm | 9 +-
guix/cache.scm | 4 +-
guix/cpu.scm | 130 +-
guix/import/cran.scm | 4 +-
guix/packages.scm | 41 +-
guix/scripts/home.scm | 1 +
guix/scripts/locate.scm | 664 +
guix/scripts/pull.scm | 31 +-
guix/scripts/refresh.scm | 33 +-
guix/store/roots.scm | 12 +-
guix/transformations.scm | 37 +-
guix/ui.scm | 9 +
guix/utils.scm | 6 +
po/doc/guix-cookbook.de.po | 1843 +-
po/doc/guix-cookbook.fr.po | 1891 +-
po/doc/guix-cookbook.ko.po | 1874 +-
po/doc/guix-cookbook.sk.po | 1891 +-
po/doc/guix-manual.de.po | 31070 ++++++++--------
po/doc/guix-manual.es.po | 31652 ++++++++---------
po/doc/guix-manual.fr.po | 31794 ++++++++---------
po/doc/guix-manual.pt_BR.po | 30222 ++++++++--------
po/doc/guix-manual.ru.po | 30557 ++++++++--------
po/doc/guix-manual.zh_CN.po | 30309 ++++++++--------
po/guix/POTFILES.in | 1 +
po/guix/bn.po | 1650 +-
po/guix/cs.po | 1694 +-
po/guix/da.po | 1715 +-
po/guix/de.po | 1801 +-
po/guix/eo.po | 1709 +-
po/guix/es.po | 1785 +-
po/guix/fa.po | 1660 +-
po/guix/fi.po | 1664 +-
po/guix/fr.po | 1800 +-
po/guix/hu.po | 1707 +-
po/guix/it.po | 1716 +-
po/guix/ja.po | 1799 +-
po/guix/ka.po | 1654 +-
po/guix/ko.po | 1667 +-
po/guix/lt.po | 1651 +-
po/guix/nl.po | 1762 +-
po/guix/oc.po | 1650 +-
po/guix/pl.po | 1706 +-
po/guix/pt_BR.po | 1771 +-
po/guix/ru.po | 1678 +-
po/guix/si.po | 1649 +-
po/guix/sk.po | 1781 +-
po/guix/sr.po | 1708 +-
po/guix/sv.po | 1701 +-
po/guix/ta.po | 1715 +-
po/guix/tr.po | 1655 +-
po/guix/uk.po | 1693 +-
po/guix/vi.po | 1705 +-
po/guix/zh_CN.po | 1702 +-
po/packages/LINGUAS | 1 +
po/packages/ja.po | 35284 +++++++++++++++++++
tests/guix-home.sh | 7 +-
tests/guix-locate.sh | 72 +
tests/packages.scm | 17 +
tests/store-roots.scm | 18 +-
298 files changed, 176002 insertions(+), 122264 deletions(-)
diff --cc gnu/packages/emacs.scm
index 046b11588d,437564f6f0..638c2f7c4e
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -95,26 -94,20 +95,26 @@@
(srfi srfi-1)
(ice-9 ftw))))
-(define-public emacs
+(define-public emacs-minimal
(package
- (name "emacs")
- (version "28.2")
+ (name "emacs-minimal")
- (version "29.0.91")
++ (version "29.0.92")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/emacs/emacs-"
- version ".tar.xz"))
+ ;; TODO: Restore url-fetch when serving 29.1
+ ;; (method url-fetch)
+ ;; (uri (string-append "mirror://gnu/emacs/emacs-"
+ ;; version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/emacs.git/";)
+ (commit (string-append "emacs-" version))))
(sha256
(base32
- "09jm1q5pvd1dc0xq5rhn66v1j235zlr72kwv5i27xigvi9nfqkv1"))
- "12144dcaihv2ymfm7g2vnvdl4h71hqnsz1mljzf34cpg6ci1h8gf"))
++ "1h3p325859svcy43iv7wr27dp68049j9d44jq5akcynqdkxz4jjn"))
(patches (search-patches "emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
- "emacs-source-date-epoch.patch"))
+
"emacs-native-comp-driver-options.patch"
+ "emacs-pgtk-super-key-fix.patch"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "lisp"