Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00
parent 05aa0c0990 87836a2a21
commit 7eae48871f
83 changed files with 894 additions and 219 deletions
@@ -511,7 +511,7 @@ stdenv.mkDerivation ({
      compiler used in the GNU system including the GNU/Linux variant.
    '';

-    maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric simons ];

    # gnatboot is not available out of linux platforms, so we disable the darwin build
    # for the gnat (ada compiler).