Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-04-13 18:50:35 +02:00
9807 changed files with 28240 additions and 18640 deletions
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = {
homepage = https://cmake.org;
homepage = "https://cmake.org";
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ xfix ];