Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-07-09 15:44:08 +02:00
339 changed files with 11134 additions and 8903 deletions
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "A library to handle keyboard descriptions";
homepage = https://xkbcommon.org;
license = licenses.mit;
maintainers = with maintainers; [ garbas ttuegel ];
maintainers = with maintainers; [ ttuegel ];
platforms = with platforms; unix;
};
}
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "A library to handle keyboard descriptions";
homepage = https://xkbcommon.org;
license = licenses.mit;
maintainers = with maintainers; [ garbas ttuegel ];
maintainers = with maintainers; [ ttuegel ];
platforms = with platforms; unix;
};
}