Merge branch 'staging' into core-updates

Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cran.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/icu4c.scm
	gnu/packages/java.scm
	gnu/packages/machine-learning.scm
	gnu/packages/tex.scm

Merge branch 'master' into staging.

With resolved conflicts in:
	gnu/local.mk
	gnu/packages/crates-io.scm

gnu: samba: Fix corrupted man pages.

* gnu/packages/samba.scm (samba) [native-inputs]: Replace docbook-xsl with
docbook-xsl-next.

gnu: Add docbook-xsl-next.

* gnu/packages/docbook.scm (docbook-xsl-next): New variable.

gnu: emacs-plz: Update to 0.2.1.

* gnu/packages/emacs-xyz.scm (emacs-plz): Update to 0.2.1.

gnu: emacs-tuareg: Improve package style.

* gnu/packages/ocaml.scm (emacs-tuareg)[arguments]<#:imported-modules,
<#:phases>: Use G-expressions.  Remove trailing #T at the end of phases.  Use
ELPA-DIRECTORY function.
[native-inputs]: Remove input labels.

gnu: emacs-tuareg: Update to 3.0.0.

* gnu/packages/ocaml.scm (emacs-tuareg): Update to 3.0.0.

gnu: emacs-pyim: Update to 5.2.5.

* gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 5.2.5.

gnu: colord: Update to 1.4.6.

* gnu/packages/gnome.scm (colord): Update to 1.4.6.
[source]: Override inherited field.
[configure-flags]: Use gexps.
[phases]: Likewise.
[native-inputs]: Remove labels.

gnu: docbook-xsl-ns: Rename to docbook-xsl-1.79.1 and use gexps.

* gnu/packages/docbook.scm (docbook-xsl-ns): Rename to...
(docbook-xsl-1.79.1): ... this.
[source]: Adjust URL and add a comment.
[arguments]: Use gexps and adjust phases accordingly.
* gnu/packages/gnome.scm (colord)[native-inputs]: Replace docbook-xsl-ns with
docbook-xsl-1.79.1.

gnu: openjdk: Update to 18.

* gnu/packages/java.scm (openjdk): Update to 18.
(openjdk18): New variable.

gnu: openjdk17: Define with make-openjdk.

* gnu/packages/java.scm (openjdk17): Define with make-openjdk.
[phases]: Use gexps.

gnu: openjdk16: Define with make-openjdk.

* gnu/packages/java.scm (openjdk16): Define with make-openjdk.

gnu: openjdk15: Define with make-openjdk.

* gnu/packages/java.scm (openjdk15): Define with make-openjdk.
[source]: Clear snippet and modules fields.
[native-inputs]: Rewrite using modify-inputs.

gnu: openjdk14: Define with make-openjdk.

* gnu/packages/java.scm (openjdk14): Define with make-openjdk.
[source]: Remove trailing #t from snippet field and improve regexp.

gnu: openjdk13: Define with make-openjdk.

* gnu/packages/java.scm (openjdk13): Define with make-openjdk.

gnu: openjdk12: Introduce 'make-openjdk' syntax and use it.

* gnu/packages/java.scm (make-openjdk): New syntax.
(openjdk12): Use it to define package.
[source]: Remove trailing #t from snippet field and improve regexp.
[phases]: Use gexps.

gnu: opendjk11: Reduce size by removing extraneous files.

By removing the *.diz and src.zip files, the size of the main output of
OpenJDK 11 is reduced from 345 MiB to 116 MiB for OpenJDK 11, while the 'jdk'
output is reduced from 805 MiB to 353 MiB.

* gnu/packages/java.scm (openjdk11)[modules]: New field.
[phases]{remove-diz-files}: New phase.
{strip-character-data-timestamps}: Order after remove-diz-files.

gnu: opendjk11: Improve regular expressions.

* gnu/packages/java.scm (openjdk11)
[phases]{strip-archive-timestamps}: Replace '.*.' with '\\.' in regexps.

gnu: opendjk11: Remove input labels.

* gnu/packages/java.scm (openjdk11)[inputs, native-inputs]: Remove labels.