Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-08-28 08:26:42 +02:00
1209 changed files with 36685 additions and 18393 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = licenses.asl20;
maintainers = with maintainers; [ offline rickynils ];
maintainers = with maintainers; [ offline ];
platforms = with platforms; unix;
};
}
+1 -1
View File
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix;
};
}
+1 -1
View File
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix;
};
}