Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    homepage = "http://www.villehelin.com/wla.html";
    description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
    license = licenses.gpl2;
-    maintainers = with maintainers; [ mbauer ];
+    maintainers = with maintainers; [ matthewbauer ];
    platforms = platforms.all;
  };
 }