public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99061 from andrew-d/andrew/rsync-3.2

Browse Source 
rsync: 3.1.3 -> 3.2.3
This commit is contained in:
Doron Behar 2020-10-02 16:48:46 +03:00 committed by GitHub
commit 820b25186b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/sync/rsync/base.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
rec { rec {
version = "3.1.3"; version = "3.2.3";
src = fetchurl { src = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"; sha256 = "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y";
}; };
upstreamPatchTarball = fetchurl { upstreamPatchTarball = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

15
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -1,9 +1,17 @@
{ stdenv, fetchurl, perl, libiconv, zlib, popt { stdenv, fetchurl, perl, libiconv, zlib, popt
, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null , enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null
, enableLZ4 ? true, lz4 ? null
, enableOpenSSL ? true, openssl ? null
, enableXXHash ? true, xxHash ? null
, enableZstd ? true, zstd ? null
, enableCopyDevicesPatch ? false , enableCopyDevicesPatch ? false
}: }:
assert enableACLs -> acl != null; assert enableACLs -> acl != null;
assert enableLZ4 -> lz4 != null;
assert enableOpenSSL -> openssl != null;
assert enableXXHash -> xxHash != null;
assert enableZstd -> zstd != null;
let let
base = import ./base.nix { inherit stdenv fetchurl; }; base = import ./base.nix { inherit stdenv fetchurl; };
@ -18,7 +26,12 @@ stdenv.mkDerivation rec {
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl; buildInputs = [libiconv zlib popt]
++ stdenv.lib.optional enableACLs acl
++ stdenv.lib.optional enableZstd zstd
++ stdenv.lib.optional enableLZ4 lz4
++ stdenv.lib.optional enableOpenSSL openssl
++ stdenv.lib.optional enableXXHash xxHash;
nativeBuildInputs = [perl]; nativeBuildInputs = [perl];
configureFlags = ["--with-nobody-group=nogroup"]; configureFlags = ["--with-nobody-group=nogroup"];