Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-06-10 04:10:34 +02:00
169 changed files with 5627 additions and 11437 deletions
@@ -4,7 +4,7 @@
assert sdlSupport -> (SDL != null);
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "8086tiny";
version = "1.25";