* doc/guix-cookbook.texi (Extended example): Mention "guix hash -rx ."

* doc/guix-cookbook.texi (Extended example): Clarify use of 'git-file-name'
and 'git-version'.

* gnu/packages/syndication.scm (liferea): Update to 1.12.8.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/video.scm (mlt)[inputs]: Change from FFMPEG-3.4 to FFMPEG.

* gnu/packages/video.scm (mlt): Update to 6.20.0.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/photo.scm (darktable): Update to 3.0.2.
[arguments]: Compile with clang.  Wrap GSETTINGS_SCHEMAS_DIR.
[license]: Add license information for Rawspeed.
[native-inputs]: Add clang, desktop-file-utils, glib, gobject-instrospection,
llvm, and po4a.  Reorder alphabetically.
[inputs]: Add colord-gtk, cups, graphicsmagick, gsettings-desktop-schemas,
iso-codes, libsecret, lua, openjpeg, and osm-gps-map.  Reorder alphabetically.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/java.scm (jamvm)[source]: Add patch.
(jamvm-1-bootstrap)[native-inputs]: Remove.
* gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/glib.scm (template-glib): Update to 3.34.0.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/tmux.scm (python-daemux): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/tmux.scm (python-libtmux): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/python-xyz.scm (python-pyfiglet): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/python-web.scm (python-flask-restx): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/python-check.scm (python-pytest-flask): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/python-check.scm (python-pytest-benchmark): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/python-xyz.scm (python-py-cpuinfo): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>

* gnu/packages/games.scm (abe): New variable.

* gnu/packages/mate.scm (mate)[propagated-inputs]: Remove as the
proper fix arrived from core-updates.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

* gnu/packages/mate.scm (mate-common): Update to 1.24.1.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

* gnu/packages/check.scm (python-pytest-lazy-fixture): New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

* gnu/packages/statistics.scm (r-with-tests, r-minimal): Update to 4.0.2.

The "image-root" derivation output is used as a temporary directory that is
passed to mke2fs and mkdosfs later on. By merging the creation of this
directory and the production of partition images, we can get rid of the
derivation.

As mke2fs and mkdosfs are not able to override file permissions, call those
commands with fakeroot. This way, all the image files will be owned by root,
even if image generation is done in an unprivilegded context.

* gnu/system/image.scm (system-disk-image): Merge "image-root" and
"iso9660-image" derivations so that we spare an extra derivation. Also add
"fakeroot" and its runtime dependencies to the inputs.
* gnu/build/image.scm (make-ext-image, make-vfat-image): Make sure that mke2fs
and mkdosfs are respectively called by fakeroot.

* gnu/packages/build-tools.scm (gn): Update to 0.0-1794.eb997b5.

This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.

* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
 #:configure-flags.  Add "icu_use_data_file=false".  Set CFLAGS in phase.
Remove obsolete substitution.  Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution.  Add
"ozone_platform_x11=true" in #:configure-flags.

* gnu/packages/icu4c.scm (icu4c-67): New public variable.

* gnu/packages/chromium.scm (ungoogled-chromium)[properties]: Add CPE-NAME.

* gnu/packages/chromium.scm (ungoogled-chromium-source): Remove (unused) SVG
file that is licensed under a NoDerivatives license.

Fixes <https://bugs.gnu.org/41987>.
Reported by Jonathan Brielmaier <jonathan.brielmaier@web.de>.

* gnu/packages/video.scm (ffmpeg-4.2): New public variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from FFMPEG
to FFMPEG-4.2.

Fixes <https://bugs.gnu.org/41993>.
Reported by Kurt I <gitlabcanada@runbox.com>.

* gnu/packages/video.scm (ffmpeg)[inputs]: Conditionally add RAV1E.
[arguments]: Adjust #:configure-flags accordingly.

The "image-root" derivation output is used as a temporary directory that is
passed to GNU Xorriso later on. By merging the creation of this directory and
the production of an ISO image, we can get rid of the derivation.

* gnu/system/image.scm (system-iso9660-image): Merge "image-root" and
"iso9660-image" derivations so that we spare an extra derivation.

* gnu/packages/vpn.scm (xl2tpd)[arguments]: Substitute hardcoded pppd path
instead of trying to set CFLAGS variable.

But keep version 2.4.1 around for packages that still need it and for python2
support.

* gnu/packages/graph.scm (python-plotly): Update to 4.8.1.
[source]: Use git-fetch so that tests are also included.
[arguments]: Enable tests.
[home-page]: Follow redirect.
(python-plotly-2.4.1): New variable.
(python2-plotly): Inherit from python-plotly-2.4.1.
* gnu/packages/bioinformatics.scm (python-deeptools)[native-inputs]: Depend on
python-plotly-2.4.1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

From 27ec21904f769c1e8114f767972d9037e1e9f68a Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 18 Jun 2020 00:58:02 +0200
Subject: [PATCH 4/5] gnu: Add python-xarray.

* gnu/package/python-science.scm (python-xarray): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

* gnu/packages/python-xyz.scm (python-retrying): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

But also keep version 0.25.3 around for packages requiring an earlier
versions, as well as version 0.24.2 for a version with python2.

* gnu/packages/python-science.scm (python-pandas): Update to 1.0.5.
[arguments]: Adapt 'patch-which phase.  Add new 'prepare-x phase.  Do not
delete tests that depend on "moto", they are skipped automatically.
[propagated-inputs]: Add python-jinja2.
[inputs]: Add xsel and xclip.
[native-inputs]: Add xorg-server-for-tests so we can test clipboard support.
(python-pandas-0.24): New variable.
(python2-pandas): Inherit from python-pandas-0.25.
* gnu/packages/bioinformatics.scm (python-biom-format)[propagated-inputs]:
Switch to python-pandas-0.25.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

And make sure python-deeptools's tests are running.

* gnu/packages/bioinformatics.scm (python-deeptools): Fetch source using git.
[native-inputs]: Add python-mock and python-nose.
(deeptools): Mark as deprecated.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

* gnu/packages/guile.scm (guile-3.0/libgc-7): Inherit from GUILE-3.0.3.

Until now, we'd call (nar-sha256 file) unconditionally.  Thus, if FILE
was a directory, we would traverse it for no reason, and then call
'deduplicate' on FILE, which would again traverse it.

This change also removes redundant (mkdir-p store) calls from the loop,
and avoids 'lstat' calls by using 'scandir*'.

* guix/store/deduplication.scm (deduplicate): Add named loop.  Move
'mkdir-p' outside the loop.  Use 'scandir*' instead of 'scandir'.  Do
not call 'nar-sha256' when FILE has type 'directory.

* guix/build/compile.scm (optimization-options): Use '-O1' for the
simple case.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.6.3.

* gnu/packages/emacs-xyz.scm (emacs-helm-fish-completion): Update to 0.5.