Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-07-28 12:11:37 +02:00
26 changed files with 805 additions and 325 deletions
@@ -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;
};