87/87: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit d9bcd1a8d6300b79f5884e48b2cefff05de8dce4
Merge: 0d65f7daae 79a9bb25bc
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Jan 10 00:24:11 2023 +0100

    Merge branch 'master' into staging

 Makefile.am                                        |    2 -
 doc/guix-cookbook.texi                             |  433 +-
 doc/guix.texi                                      |    4 +
 etc/news.scm                                       |   14 +-
 gnu/home/services.scm                              |    8 +-
 gnu/local.mk                                       |    3 +
 gnu/packages/aux-files/linux-libre/4.9-i686.conf   | 9062 --------------------
 gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 8910 -------------------
 gnu/packages/axoloti.scm                           |    4 +-
 gnu/packages/batik.scm                             |    4 +-
 gnu/packages/bioconductor.scm                      |   50 +-
 gnu/packages/bioinformatics.scm                    |   33 +
 gnu/packages/code.scm                              |   41 +-
 gnu/packages/cran.scm                              |  233 +-
 gnu/packages/crates-io.scm                         |  109 +-
 gnu/packages/engineering.scm                       |   47 +-
 gnu/packages/fontutils.scm                         |    1 +
 gnu/packages/groovy.scm                            |    1 +
 gnu/packages/haskell-apps.scm                      |   12 +-
 gnu/packages/java-bootstrap.scm                    |  724 ++
 gnu/packages/java-xml.scm                          |  688 ++
 gnu/packages/java.scm                              | 1086 +--
 gnu/packages/linux.scm                             |   69 +-
 gnu/packages/llvm.scm                              |    8 +-
 gnu/packages/maven.scm                             |    2 +-
 gnu/packages/minetest.scm                          |   47 +
 .../python-afdko-suppress-copyright-test.patch     |   20 +
 gnu/packages/rust-apps.scm                         |   15 +-
 gnu/packages/statistics.scm                        |   12 +-
 gnu/packages/web.scm                               |   50 +-
 gnu/packages/xml.scm                               |  642 --
 gnu/services/base.scm                              |   10 +-
 gnu/tests/base.scm                                 |    4 -
 guix/derivations.scm                               |   10 +-
 guix/import/cran.scm                               |    6 +-
 guix/read-print.scm                                |   22 +-
 guix/scripts/substitute.scm                        |   10 +-
 nix/libutil/hash.cc                                |    7 +-
 tests/derivations.scm                              |   52 +-
 tests/guix-home.sh                                 |   12 +-
 tests/read-print.scm                               |    7 +-
 41 files changed, 2702 insertions(+), 19772 deletions(-)

diff --cc gnu/packages/crates-io.scm
index 58ddaa4e8f,1203d10b67..300803ce69
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@@ -68,8 -68,8 +68,9 @@@
    #:use-module (gnu packages databases)
    #:use-module (gnu packages fontutils)
    #:use-module (gnu packages gettext)
 +  #:use-module (gnu packages gl)
    #:use-module (gnu packages glib)
+   #:use-module (gnu packages icu4c)
    #:use-module (gnu packages image)
    #:use-module (gnu packages jemalloc)
    #:use-module (gnu packages linux)