Merge branch 'master' into staging.

With "conflicts" solved (all in favor of master except git) in:
	gnu/local.mk
	gnu/packages/databases.scm
	gnu/packages/glib.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/graphics.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/linux.scm
	gnu/packages/machine-learning.scm
	gnu/packages/networking.scm
	gnu/packages/polkit.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/rpc.scm
	gnu/packages/rust.scm
	gnu/packages/version-control.scm
	gnu/packages/w3m.scm

1 files changed, 19 insertions, 19 deletions

diff --git a/gnu/packages/patool.scm b/gnu/packages/patool.scm
index a808555795..31dfd994b1 100644
--- a/gnu/packages/patool.scm
+++ b/gnu/packages/patool.scm
@@ -54,25 +54,25 @@
                       (when tests?
                         (invoke "pytest")))))))
     (native-inputs
-     `(("bzip2" ,bzip2)
-       ("cabextract" ,cabextract)
-       ("cdrtools" ,cdrtools)
-       ("clzip" ,clzip)
-       ("cpio" ,cpio)
-       ("dpkg" ,dpkg)
-       ("file" ,file)
-       ("flac" ,flac)
-       ("libarchive" ,libarchive)       ;for bsdtar
-       ("lhasa" ,lhasa)
-       ("lrzip" ,lrzip)
-       ("lzip" ,lzip)
-       ("lzop" ,lzop)
-       ("python-pytest" ,python-pytest)
-       ("p7zip" ,p7zip)
-       ("pbzip2" ,pbzip2)
-       ("pigz" ,pigz)
-       ("plzip" ,plzip)
-       ("rpm" ,rpm)))
+     (list bzip2
+           cabextract
+           cdrtools
+           clzip
+           cpio
+           dpkg
+           file
+           flac
+           libarchive ;for bsdtar
+           lhasa
+           lrzip
+           lzip
+           lzop
+           python-pytest
+           p7zip
+           pbzip2
+           pigz
+           plzip
+           rpm))
     (home-page "https://wummel.github.io/patool/")
     (synopsis "Portable archive file manager")
     (description "Patool provides a unified command line interface for a