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

svn merge ^/nixpkgs/trunk, one simple conflict in jruby

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
This commit is contained in:
Yury G. Kudryashov
2012-01-19 21:31:51 +00:00
parent 3980444b2b b94fef3cba
commit 84c0185038
69 changed files with 763 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/sync/rsync/default.nix
+11 -2
View File
@@ -1,17 +1,26 @@
{ stdenv, fetchurl, perl
, enableACLs ? true, acl ? null
, enableCopyDevicesPatch ? false
}:
assert enableACLs -> acl != null;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "rsync-3.0.9";
src = fetchurl {
mainSrc = fetchurl {
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
};
patchesSrc = fetchurl {
url = http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz;
sha256 = "0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9";
};
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = stdenv.lib.optional enableACLs acl;
buildNativeInputs = [perl];