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

2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
@@ -68,8 +68,6 @@ stdenv.mkDerivation rec {
    '';

    platforms = platforms.unix;
-    # Note: Maintainer of prev. erlang version was simons. If he wants
-    # to continue maintaining erlang I'm totally ok with that.
    maintainers = [ maintainers.the-kenny ];
  };
 }
@@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
    '';

    platforms = platforms.unix;
-    # Note: Maintainer of prev. erlang version was simons. If he wants
-    # to continue maintaining erlang I'm totally ok with that.
    maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ];
  };
 }