01/01: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit dedbaa3a69e8e4da419d62ce0022c1af02bbef5a
Merge: 5bfe389a6e 57f8f69562
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Aug 28 15:43:30 2022 +0200

    Merge branch 'master' into staging

 gnu/local.mk                                       |   4 +-
 gnu/packages/admin.scm                             |  12 +-
 gnu/packages/bdw-gc.scm                            |   5 +
 gnu/packages/bioconductor.scm                      |  10 +-
 gnu/packages/build-tools.scm                       | 101 ++++++++++++
 gnu/packages/direct-connect.scm                    |   2 +-
 gnu/packages/disk.scm                              |   1 +
 gnu/packages/education.scm                         |   4 +-
 gnu/packages/emacs-xyz.scm                         | 183 +++++++++++++++------
 gnu/packages/game-development.scm                  |   1 +
 gnu/packages/geo.scm                               |   6 +-
 gnu/packages/gnome.scm                             |  81 +++++++--
 gnu/packages/gps.scm                               |   1 +
 gnu/packages/gtk.scm                               |   1 -
 gnu/packages/image.scm                             |   1 +
 gnu/packages/installers.scm                        |   2 +-
 gnu/packages/libffi.scm                            |  20 +--
 .../patches/gnome-shell-polkit-autocleanup.patch   |  50 ++++++
 gnu/packages/patches/scons-test-environment.patch  |  57 +++++++
 gnu/packages/python-xyz.scm                        |  45 -----
 gnu/packages/qt.scm                                |   2 +-
 gnu/packages/samba.scm                             |   7 +-
 gnu/packages/web.scm                               |   4 +-
 gnu/packages/webkit.scm                            |   7 +-
 gnu/packages/wm.scm                                |  11 +-
 gnu/packages/xdisorg.scm                           |   1 +
 guix/build-system/scons.scm                        |   4 +-
 27 files changed, 472 insertions(+), 151 deletions(-)

diff --cc gnu/packages/bdw-gc.scm
index c812248e86,268f0703b8..4dd559ef79
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@@ -133,8 -133,13 +133,13 @@@ C or C++ programs, though that is not i
                      version "/libatomic_ops-" version ".tar.gz"))
                (sha256
                 (base32
 -                "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"))))
 +                "0glzah695wsf6c27hs5wwlw4mnq1vfivdshz1rb8pq7w4mp5dazh"))))
      (build-system gnu-build-system)
+     (arguments
+      `(,@(if (target-riscv64?)
+            `(#:configure-flags
+              (list "CFLAGS_EXTRA=-latomic"))
+            '())))
      (outputs '("out" "debug"))
      (synopsis "Accessing hardware atomic memory update operations")
      (description