Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
--- a/pkgs/development/libraries/librsync/0.9.nix
+++ b/pkgs/development/libraries/librsync/0.9.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
    homepage = http://librsync.sourceforge.net/;
    license = stdenv.lib.licenses.lgpl2Plus;
    description = "Implementation of the rsync remote-delta algorithm";
+    platforms = stdenv.lib.platforms.unix;
  };
 }