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
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
branch = "1.11";
homepage = https://www.gnu.org/software/automake/;
homepage = "https://www.gnu.org/software/automake/";
description = "GNU standard-compliant makefile generator";
longDescription = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = {
branch = "1.15";
homepage = https://www.gnu.org/software/automake/;
homepage = "https://www.gnu.org/software/automake/";
description = "GNU standard-compliant makefile generator";
license = stdenv.lib.licenses.gpl2Plus;