Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-11-11 12:09:26 +01:00
442 changed files with 23507 additions and 19144 deletions
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.vbmithr
];
};