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, 9 insertions, 43 deletions

diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 956c942770..13717f0249 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -39,39 +39,6 @@
 (define-public rsync
   (package
    (name "rsync")
-   (version "3.1.3")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://rsync.samba.org/ftp/rsync/src/rsync-"
-                                version ".tar.gz"))
-            (sha256
-             (base32
-              "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"))))
-   (build-system gnu-build-system)
-   (arguments
-    `(#:configure-flags
-      ;; The bundled copies are preferred by default.
-      (list "--without-included-zlib"
-            "--without-included-popt")))
-   (native-inputs
-    `(("perl" ,perl)))
-   (inputs
-    `(("acl" ,acl)
-      ("popt" ,popt)
-      ("zlib" ,zlib)))
-   (synopsis "Remote (and local) file copying tool")
-   (description
-    "Rsync is a fast and versatile file copying tool.  It can copy locally,
-to/from another host over any remote shell, or to/from a remote rsync daemon.
-Its delta-transfer algorithm reduces the amount of data sent over the network
-by sending only the differences between the source files and the existing
-files in the destination.")
-   (license license:gpl3+)
-   (home-page "https://rsync.samba.org/")))
-
-(define-public rsync-next
-  (package
-   (name "rsync")
    (version "3.2.3")
    (source (origin
             (method url-fetch)
@@ -89,14 +56,14 @@ files in the destination.")
             ;; Avoid these dependencies for now.
             "--disable-openssl")))
    (native-inputs
-    `(("perl" ,perl)))
+    (list perl))
    (inputs
-    `(("acl" ,acl)
-      ("lz4" ,lz4)
-      ("popt" ,popt)
-      ("xxhash" ,xxhash)
-      ("zlib" ,zlib)
-      ("zstd:lib" ,zstd "lib")))
+    (list acl
+          lz4
+          popt
+          xxhash
+          zlib
+          `(,zstd "lib")))
    (synopsis "Remote (and local) file copying tool")
    (description
     "Rsync is a fast and versatile file copying tool.  It can copy locally,
@@ -122,10 +89,9 @@ files in the destination.")
               "0bn29npmbw26akc6y54661irpdh6qcivcs6q48cgp3llklhhxp0q"))))
    (build-system cmake-build-system)
    (inputs
-    `(("popt" ,popt)))
+    (list popt))
    (native-inputs
-    `(("which" ,which)
-      ("perl" ,perl)))
+    (list which perl))
    (home-page "http://librsync.sourceforge.net/")
    (synopsis "Implementation of the rsync remote-delta algorithm")
    (description