Merge remote-tracking branch 'upstream/master' into openssl-1.1

2019-08-02 02:58:52 +02:00
parent 3bef4d156d 841e20e583
commit 30969073f0
316 changed files with 47697 additions and 39381 deletions
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    description = ''A set of tools to optimize deflate-compressed files'';
    license = licenses.gpl3 ;
    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
    homepage = https://github.com/amadvance/advancecomp;

  };