guix-commits
[Top][All Lists]
Advanced

[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: Sat, 26 Aug 2023 03:10:00 -0400 (EDT)

lilyp pushed a commit to branch emacs-team
in repository guix.

commit 9d074e16c7a9879d67c348c7b2d70b725adfbdfa
Merge: ca7e310f7a eeb71d778f
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sat Aug 26 07:08:03 2023 +0200

    Merge branch 'master' into emacs-team

 .guix-authorizations                               |     3 +
 .mailmap                                           |     1 +
 Makefile.am                                        |    59 +-
 doc/contributing.texi                              |    15 +-
 doc/guix-cookbook.texi                             |   283 +-
 doc/guix.texi                                      |   475 +-
 doc/local.mk                                       |     4 +-
 {build-aux/cuirass => etc}/hurd-manifest.scm       |     0
 etc/teams.scm.in                                   |     6 +-
 etc/teams/qt/common.scm                            |    50 +
 etc/teams/qt/qt-manifest.scm                       |    34 +
 etc/teams/qt/qt5-manifest.scm                      |    34 +
 gnu/build/activation.scm                           |     6 +-
 gnu/ci.scm                                         |    69 +-
 gnu/home/services.scm                              |    69 +-
 gnu/home/services/dict.scm                         |    32 +
 gnu/home/services/mcron.scm                        |    96 +-
 gnu/home/services/shepherd.scm                     |     4 +-
 gnu/home/services/ssh.scm                          |     8 +-
 gnu/home/services/syncthing.scm                    |    30 +
 gnu/local.mk                                       |    25 +-
 gnu/packages/accessibility.scm                     |     4 +-
 gnu/packages/admin.scm                             |    42 +-
 gnu/packages/astronomy.scm                         |    38 +
 gnu/packages/audio.scm                             |    57 +-
 gnu/packages/backup.scm                            |     4 +-
 gnu/packages/base.scm                              |    11 +-
 gnu/packages/build-tools.scm                       |     2 +-
 gnu/packages/check.scm                             |     4 +-
 gnu/packages/chemistry.scm                         |    12 +-
 gnu/packages/ci.scm                                |     6 +-
 gnu/packages/commencement.scm                      |    58 +-
 gnu/packages/cpp.scm                               |    32 +-
 gnu/packages/cran.scm                              |     4 +-
 gnu/packages/crates-gtk.scm                        |   231 +-
 gnu/packages/crates-io.scm                         | 12287 +++-
 gnu/packages/databases.scm                         |     6 +-
 gnu/packages/disk.scm                              |    38 +
 gnu/packages/display-managers.scm                  |     4 +-
 gnu/packages/dns.scm                               |    71 +-
 gnu/packages/dunst.scm                             |     4 +-
 gnu/packages/ebook.scm                             |     3 +-
 gnu/packages/education.scm                         |     6 +-
 gnu/packages/emacs-xyz.scm                         |    23 +
 gnu/packages/embedded.scm                          |     9 +-
 gnu/packages/engineering.scm                       |    21 +-
 gnu/packages/fcitx5.scm                            |    44 +-
 gnu/packages/file-systems.scm                      |     7 +-
 gnu/packages/freedesktop.scm                       |   144 +-
 gnu/packages/fvwm.scm                              |     4 +-
 gnu/packages/games.scm                             |    99 +-
 gnu/packages/genealogy.scm                         |     2 +-
 gnu/packages/geo.scm                               |     2 +-
 gnu/packages/gettext.scm                           |     6 +-
 gnu/packages/glib.scm                              |    40 +
 gnu/packages/gnome.scm                             |    26 +-
 gnu/packages/gnupg.scm                             |     3 +-
 gnu/packages/graphics.scm                          |     2 +-
 gnu/packages/gstreamer.scm                         |     3 +
 gnu/packages/guile-xyz.scm                         |    10 +-
 gnu/packages/ibus.scm                              |     6 +-
 gnu/packages/image-processing.scm                  |     4 +-
 gnu/packages/image-viewers.scm                     |     2 +-
 gnu/packages/image.scm                             |    19 +-
 gnu/packages/instrumentation.scm                   |     4 +-
 gnu/packages/irc.scm                               |    89 +-
 gnu/packages/kde-frameworks.scm                    |  1140 +-
 gnu/packages/kde-games.scm                         |   237 +-
 gnu/packages/kde-internet.scm                      |    69 +-
 gnu/packages/kde-multimedia.scm                    |    50 +-
 gnu/packages/kde-pim.scm                           |   295 +-
 gnu/packages/kde-plasma.scm                        |   717 +-
 gnu/packages/kde-systemtools.scm                   |   114 +-
 gnu/packages/kde-utils.scm                         |   168 +-
 gnu/packages/kde.scm                               |   483 +-
 gnu/packages/language.scm                          |     2 +-
 gnu/packages/linux.scm                             |    93 +-
 gnu/packages/lisp-xyz.scm                          |   164 +-
 gnu/packages/lua.scm                               |     4 +-
 gnu/packages/lxqt.scm                              |     6 +-
 gnu/packages/machine-learning.scm                  |    15 +-
 gnu/packages/mail.scm                              |    61 +-
 gnu/packages/mastodon.scm                          |     4 +-
 gnu/packages/maths.scm                             |   171 +-
 gnu/packages/mc.scm                                |   100 +-
 gnu/packages/messaging.scm                         |     2 +-
 gnu/packages/mingw.scm                             |     8 +-
 gnu/packages/mpd.scm                               |     4 +-
 gnu/packages/music.scm                             |     6 +-
 gnu/packages/networking.scm                        |    40 +-
 gnu/packages/noweb.scm                             |   112 +-
 gnu/packages/ntp.scm                               |    51 +-
 gnu/packages/openbox.scm                           |     4 +-
 gnu/packages/package-management.scm                |    46 +-
 gnu/packages/patches/akonadi-not-relocatable.patch |     6 +-
 .../patches/bloomberg-bde-cmake-module-path.patch  |    14 +-
 gnu/packages/patches/ddclient-skip-test.patch      |    43 -
 gnu/packages/patches/elogind-fix-rpath.patch       |    60 +
 .../patches/elogind-revert-polkit-detection.patch  |    41 -
 gnu/packages/patches/fbreader-fix-icon.patch       |    29 +
 gnu/packages/patches/fluxbox-1.3.7-gcc.patch       |    16 +
 .../patches/grantlee-fix-i586-precision.patch      |    40 +
 gnu/packages/patches/highlight-gui-data-dir.patch  |    51 +
 gnu/packages/patches/ibus-anthy-fix-tests.patch    |    16 +-
 .../patches/kwayland-skip-flaky-test.patch         |    13 -
 .../patches/maturin-no-cross-compile.patch         |    55 +
 gnu/packages/patches/mcrl2-fix-1687.patch          |   337 -
 .../patches/mcrl2-fix-counterexample.patch         |    32 -
 .../patches/mingw-w64-reproducible-gendef.patch    |    16 +-
 gnu/packages/patches/openssh-hurd.patch            |    30 -
 .../patches/po4a-partial-texinfo-menu-fix.patch    |   242 +
 .../patches/python-shiboken-2-compat.patch         |    15 -
 .../patches/qtdeclarative-5-disable-qmlcache.patch |    16 +
 .../patches/qtdeclarative-disable-qmlcache.patch   |    16 +
 gnu/packages/patches/qtwayland-gcc-11.patch        |    18 -
 .../patches/rust-nettle-sys-disable-vendor.patch   |    48 -
 .../patches/rust-ring-0.16-missing-files.patch     |  2293 +
 .../patches/rust-ring-0.16-test-files.patch        |    54 +
 gnu/packages/pdf.scm                               |     2 +-
 gnu/packages/photo.scm                             |    70 +-
 gnu/packages/pkg-config.scm                        |     5 +-
 gnu/packages/pretty-print.scm                      |   135 +-
 gnu/packages/python-crypto.scm                     |    39 +-
 gnu/packages/python-web.scm                        |     8 +-
 gnu/packages/python-xyz.scm                        |    60 +-
 gnu/packages/qt.scm                                |   712 +-
 gnu/packages/rust-apps.scm                         |   278 +-
 gnu/packages/rust.scm                              |    17 +-
 gnu/packages/scheme.scm                            |     2 +-
 gnu/packages/screen.scm                            |     4 +-
 gnu/packages/scsi.scm                              |    30 +-
 gnu/packages/sdl.scm                               |     2 -
 gnu/packages/sequoia.scm                           |   615 +-
 gnu/packages/ssh.scm                               |    19 +-
 gnu/packages/stalonetray.scm                       |    49 -
 gnu/packages/syncthing.scm                         |   113 +-
 gnu/packages/syndication.scm                       |     7 +-
 gnu/packages/telegram.scm                          |     2 +-
 gnu/packages/terminals.scm                         |   103 +-
 gnu/packages/tex.scm                               | 69289 ++++++++++++++-----
 gnu/packages/texlive.scm                           |   417 +
 gnu/packages/tls.scm                               |     4 +-
 gnu/packages/tor.scm                               |     4 +-
 gnu/packages/tree-sitter.scm                       |    20 +
 gnu/packages/tryton.scm                            |     2 +-
 gnu/packages/version-control.scm                   |     4 +-
 gnu/packages/video.scm                             |     9 +-
 gnu/packages/vnc.scm                               |     2 +-
 gnu/packages/web-browsers.scm                      |     9 +-
 gnu/packages/wm.scm                                |     7 +-
 gnu/packages/xdisorg.scm                           |   128 +-
 gnu/packages/xfce.scm                              |    28 +
 gnu/packages/xml.scm                               |     6 +-
 gnu/services.scm                                   |    25 +-
 gnu/services/admin.scm                             |    31 +-
 gnu/services/authentication.scm                    |     2 +-
 gnu/services/base.scm                              |    65 +-
 gnu/services/databases.scm                         |    37 +-
 gnu/services/desktop.scm                           |    57 +
 gnu/services/dict.scm                              |    84 +-
 gnu/services/dns.scm                               |   168 +-
 gnu/services/guix.scm                              |     2 +-
 gnu/services/kerberos.scm                          |     4 +-
 gnu/services/linux.scm                             |   203 +-
 gnu/services/mcron.scm                             |    85 +-
 gnu/services/pam-mount.scm                         |     2 +-
 gnu/services/sddm.scm                              |    11 +-
 gnu/services/syncthing.scm                         |    56 +-
 gnu/system/accounts.scm                            |     3 +
 gnu/system/examples/plasma.tmpl                    |    72 +
 gnu/system/image.scm                               |    19 +-
 gnu/tests/cachefilesd.scm                          |    71 +
 gnu/tests/desktop.scm                              |     2 +-
 gnu/tests/install.scm                              |     4 +-
 gnu/tests/pam.scm                                  |    72 +-
 guix/build/qt-utils.scm                            |     2 +-
 guix/download.scm                                  |    10 +-
 guix/git.scm                                       |     2 +-
 guix/gnu-maintenance.scm                           |     6 +-
 guix/graph.scm                                     |    36 +-
 guix/import/texlive.scm                            |     9 +-
 guix/inferior.scm                                  |    57 +-
 guix/profiles.scm                                  |     2 +-
 guix/scripts/home.scm                              |     4 +
 guix/scripts/pull.scm                              |    20 +-
 guix/scripts/refresh.scm                           |    31 +-
 guix/scripts/system.scm                            |     2 +-
 guix/scripts/time-machine.scm                      |    46 +-
 guix/ssh.scm                                       |     5 +-
 guix/ui.scm                                        |    16 +-
 tests/graph.scm                                    |    24 +-
 tests/guix-build.sh                                |     9 +-
 tests/guix-home.sh                                 |     2 +-
 tests/guix-refresh.sh                              |     7 +
 tests/guix-shell.sh                                |     2 +-
 tests/guix-time-machine.sh                         |    28 +
 tests/packages.scm                                 |     5 +-
 tests/store-roots.scm                              |     7 -
 tests/texlive.scm                                  |     4 +-
 199 files changed, 69506 insertions(+), 26569 deletions(-)

diff --cc gnu/local.mk
index bdaa9935b1,ee4567c857..99819286d7
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1089,8 -1091,7 +1091,8 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/elm-ghc9.2.patch       \
    %D%/packages/patches/elm-offline-package-registry.patch     \
    %D%/packages/patches/elm-reactor-static-files.patch         \
-   %D%/packages/patches/elogind-revert-polkit-detection.patch  \
+   %D%/packages/patches/elogind-fix-rpath.patch                        \
 +  %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch  \
    %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch   \
    %D%/packages/patches/emacs-exec-path.patch                  \
    %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch    \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]