guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into gnome-team


From: guix-commits
Subject: 01/01: Merge branch 'master' into gnome-team
Date: Mon, 23 Oct 2023 15:11:40 -0400 (EDT)

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

commit e38d6a9c2fba815ac34e74baa843f15e33846813
Merge: da716c8b9c cbd20d6274
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Mon Oct 23 21:09:49 2023 +0200

    Merge branch 'master' into gnome-team
    
    Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191

 .dir-locals.el                                     |     2 +-
 .gitignore                                         |     1 -
 .patman                                            |     1 +
 Makefile.am                                        |    22 +-
 configure.ac                                       |     1 -
 doc/contributing.texi                              |    50 +-
 doc/guix-cookbook.texi                             |   651 +-
 doc/guix.texi                                      |   204 +-
 etc/git/commit-msg                                 |    94 +
 etc/snippets/tempel/scheme-mode                    |    22 +-
 etc/snippets/yas/scheme-mode/guix-package          |     5 +-
 etc/{teams.scm.in => teams.scm}                    |    21 +-
 gnu/build/accounts.scm                             |     2 +-
 gnu/build/icecat-extension.scm                     |    70 +
 gnu/build/linux-modules.scm                        |     3 +-
 gnu/home/services.scm                              |    20 +-
 gnu/local.mk                                       |    21 +-
 gnu/packages/admin.scm                             |    74 +-
 gnu/packages/agda.scm                              |     1 +
 gnu/packages/apl.scm                               |    86 +
 gnu/packages/astronomy.scm                         |   299 +-
 gnu/packages/audio.scm                             |   113 +-
 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/avr-xyz.scm                           |    83 +
 gnu/packages/avr.scm                               |   212 +-
 gnu/packages/base.scm                              |    10 +
 gnu/packages/bioconductor.scm                      |    77 +-
 gnu/packages/bioinformatics.scm                    |    74 +-
 gnu/packages/bootloaders.scm                       |     3 +-
 gnu/packages/browser-extensions.scm                |    14 +-
 gnu/packages/cdrom.scm                             |     4 +-
 gnu/packages/check.scm                             |     8 +-
 gnu/packages/ci.scm                                |   126 +-
 gnu/packages/connman.scm                           |     9 +-
 gnu/packages/containers.scm                        |     7 +-
 gnu/packages/cpp.scm                               |    75 +
 gnu/packages/cran.scm                              |    87 +-
 gnu/packages/crates-graphics.scm                   |   286 +-
 gnu/packages/crates-gtk.scm                        |   356 +-
 gnu/packages/crates-io.scm                         |  5392 +++++++--
 gnu/packages/crypto.scm                            |   147 +-
 gnu/packages/curl.scm                              |    27 +-
 gnu/packages/databases.scm                         |     1 +
 gnu/packages/display-managers.scm                  |    52 +
 gnu/packages/education.scm                         |     1 +
 gnu/packages/emacs-xyz.scm                         |   255 +-
 gnu/packages/embedded.scm                          |     8 +-
 gnu/packages/engineering.scm                       |   115 +-
 gnu/packages/file-systems.scm                      |     1 +
 gnu/packages/finance.scm                           |    16 +-
 gnu/packages/firmware.scm                          |   387 +-
 gnu/packages/flashing-tools.scm                    |    64 +-
 gnu/packages/fonts.scm                             |    15 +-
 gnu/packages/fontutils.scm                         |    31 +
 gnu/packages/freedesktop.scm                       |    34 +-
 gnu/packages/games.scm                             |   107 +-
 gnu/packages/geo.scm                               |     4 +-
 gnu/packages/gl.scm                                |    52 +-
 gnu/packages/gnome.scm                             |   114 +-
 gnu/packages/gnuzilla.scm                          |    22 +-
 gnu/packages/golang-check.scm                      |   555 +
 gnu/packages/golang.scm                            |   536 +-
 gnu/packages/graphics.scm                          |    99 +-
 gnu/packages/gtk.scm                               |    39 +-
 gnu/packages/guile-xyz.scm                         |    30 +-
 gnu/packages/guile.scm                             |     4 +-
 gnu/packages/image.scm                             |    10 +-
 gnu/packages/ipfs.scm                              |     1 +
 gnu/packages/irc.scm                               |     5 +-
 gnu/packages/linux.scm                             |   216 +-
 gnu/packages/lisp-xyz.scm                          |   341 +-
 gnu/packages/llvm.scm                              |    25 +-
 gnu/packages/mail.scm                              |    34 +-
 gnu/packages/mastodon.scm                          |    63 +-
 gnu/packages/maths.scm                             |   509 +-
 gnu/packages/messaging.scm                         |    61 +-
 gnu/packages/mpd.scm                               |     6 +-
 gnu/packages/music.scm                             |    10 +-
 gnu/packages/ncdu.scm                              |     8 +-
 gnu/packages/ncurses.scm                           |     2 +-
 gnu/packages/networking.scm                        |    18 +-
 gnu/packages/nss.scm                               |    15 +
 gnu/packages/ocaml.scm                             |    50 +-
 gnu/packages/onc-rpc.scm                           |    14 +-
 gnu/packages/package-management.scm                |     6 +-
 gnu/packages/patches/connman-CVE-2022-32292.patch  |    34 -
 .../patches/connman-CVE-2022-32293-pt1.patch       |   140 -
 .../patches/connman-CVE-2022-32293-pt2.patch       |   173 -
 .../connman-add-missing-libppp-compat.h.patch      |   140 +
 .../patches/converseen-hide-updates-checks.patch   |    24 +-
 .../patches/ergodox-firmware-fix-json-target.patch |  1405 +++
 .../patches/ergodox-firmware-fix-numpad.patch      |    18 +
 .../patches/glibc-2.35-CVE-2023-4911.patch         |   160 +
 gnu/packages/patches/icecat-compare-paths.patch    |    21 +
 .../patches/icecat-use-system-wide-dir.patch       |    36 +
 .../patches/qmk-firmware-fix-hacker-dvorak.patch   |    15 +
 ...se-use-TZDIR.patch => qtbase-5-use-TZDIR.patch} |     0
 gnu/packages/patches/qtbase-use-TZDIR.patch        |   162 +-
 .../patches/rust-1.70-fix-rustix-build.patch       |    21 +
 .../patches/rust-openssl-sys-no-vendor.patch       |    32 -
 .../patches/teuchos-remove-duplicate-using.patch   |    34 +
 .../patches/tootle-glib-object-naming.patch        |    66 -
 gnu/packages/patches/tootle-reason-phrase.patch    |    48 -
 .../patches/tpetra-remove-duplicate-using.patch    |    18 +
 gnu/packages/patches/u-boot-patman-change-id.patch |   232 +
 gnu/packages/patches/unison-fix-ocaml-4.08.patch   |    81 -
 gnu/packages/pdf.scm                               |    19 +-
 gnu/packages/polkit.scm                            |    35 +-
 gnu/packages/python-crypto.scm                     |    48 +-
 gnu/packages/python-science.scm                    |    10 +-
 gnu/packages/python-web.scm                        |   121 +-
 gnu/packages/python-xyz.scm                        |   269 +-
 gnu/packages/qt.scm                                |   245 +-
 gnu/packages/radio.scm                             |    58 +-
 gnu/packages/rust-apps.scm                         |   286 +-
 gnu/packages/rust.scm                              |   246 +-
 gnu/packages/samba.scm                             |    34 +-
 gnu/packages/serialization.scm                     |    19 +-
 gnu/packages/shells.scm                            |    10 +-
 gnu/packages/ssh.scm                               |    44 +-
 gnu/packages/statistics.scm                        |   122 +-
 gnu/packages/syndication.scm                       |     7 +-
 gnu/packages/terminals.scm                         |    38 +-
 gnu/packages/text-editors.scm                      |     4 +-
 gnu/packages/textutils.scm                         |     1 +
 gnu/packages/tls.scm                               |    17 +
 gnu/packages/tree-sitter.scm                       |   110 +-
 gnu/packages/version-control.scm                   |     6 +
 gnu/packages/video.scm                             |    23 +-
 gnu/packages/vim.scm                               |    24 +
 gnu/packages/virtualization.scm                    |   162 +-
 gnu/packages/web-browsers.scm                      |     4 +-
 gnu/packages/web.scm                               |    22 +
 gnu/packages/wm.scm                                |    34 +-
 gnu/packages/xdisorg.scm                           |    20 +-
 gnu/packages/xorg.scm                              |    27 +-
 gnu/packages/zig-xyz.scm                           |    72 +-
 gnu/services/base.scm                              |   134 +-
 gnu/services/cuirass.scm                           |     7 +-
 gnu/services/networking.scm                        |    12 +-
 gnu/tests/networking.scm                           |   151 +
 guix/build-system/android-ndk.scm                  |     1 -
 guix/build-system/ant.scm                          |     1 -
 guix/build-system/dub.scm                          |     1 -
 guix/build-system/{dub.scm => zig.scm}             |    85 +-
 guix/build/cargo-build-system.scm                  |    41 +-
 guix/build/syscalls.scm                            |    13 +-
 guix/build/zig-build-system.scm                    |   100 +
 guix/import/crate.scm                              |     9 +-
 guix/import/opam.scm                               |     6 +-
 guix/scripts/archive.scm                           |     2 +-
 guix/scripts/build.scm                             |     2 +-
 guix/scripts/challenge.scm                         |     2 +-
 guix/scripts/container.scm                         |     2 +-
 guix/scripts/copy.scm                              |     2 +-
 guix/scripts/deploy.scm                            |     2 +-
 guix/scripts/describe.scm                          |     2 +-
 guix/scripts/discover.scm                          |     2 +-
 guix/scripts/download.scm                          |     2 +-
 guix/scripts/edit.scm                              |     2 +-
 guix/scripts/gc.scm                                |     2 +-
 guix/scripts/git.scm                               |     2 +-
 guix/scripts/graph.scm                             |     2 +-
 guix/scripts/hash.scm                              |     2 +-
 guix/scripts/home.scm                              |     2 +-
 guix/scripts/import.scm                            |     2 +-
 guix/scripts/install.scm                           |     2 +-
 guix/scripts/lint.scm                              |     2 +-
 guix/scripts/locate.scm                            |    24 +-
 guix/scripts/offload.scm                           |     5 +-
 guix/scripts/pack.scm                              |    72 +-
 guix/scripts/package.scm                           |     2 +-
 guix/scripts/processes.scm                         |     2 +-
 guix/scripts/publish.scm                           |     2 +-
 guix/scripts/pull.scm                              |     2 +-
 guix/scripts/refresh.scm                           |     2 +-
 guix/scripts/remove.scm                            |     2 +-
 guix/scripts/repl.scm                              |     2 +-
 guix/scripts/search.scm                            |     2 +-
 guix/scripts/shell.scm                             |     5 +-
 guix/scripts/show.scm                              |     2 +-
 guix/scripts/size.scm                              |     2 +-
 guix/scripts/style.scm                             |     2 +-
 guix/scripts/substitute.scm                        |     2 +-
 guix/scripts/system.scm                            |     2 +-
 guix/scripts/time-machine.scm                      |     2 +-
 guix/scripts/upgrade.scm                           |     2 +-
 guix/scripts/weather.scm                           |     2 +-
 guix/ui.scm                                        |    21 +-
 tests/crate.scm                                    |    40 +-
 tests/guix-system.sh                               |     4 +
 tests/pack.scm                                     |    28 +-
 195 files changed, 14094 insertions(+), 50099 deletions(-)

diff --cc gnu/packages/gnome.scm
index 87b860f9d9,ac3035e07d..a86ddc34b3
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -7940,10 -7961,9 +7937,9 @@@ to display dialog boxes from the comman
             pipewire
             python
             python-dbus
-            python-dbusmock
-            tini))                       ;acting as init (zombie reaper)
+            python-dbusmock))
      (propagated-inputs
 -     (list gsettings-desktop-schemas-next ;required by libmutter.pc
 +     (list gsettings-desktop-schemas      ;required by libmutter.pc
             gtk+                           ;required by libmutter.pc
             ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
             at-spi2-core



reply via email to

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