diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/rsync.scm | |
parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/rsync.scm')
-rw-r--r-- | gnu/packages/rsync.scm | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index bce184da58..13717f0249 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -39,37 +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 - (list perl)) - (inputs - (list acl popt 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,12 +58,12 @@ files in the destination.") (native-inputs (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, |