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
@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
      '';

    platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
  };
 }
@@ -73,7 +73,7 @@ let self = stdenv.mkDerivation rec {
      '';

    platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
  };
 };
  in self