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
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    homepage = "http://nostatic.org/grip";
    license = stdenv.lib.licenses.gpl2;

-    maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
    platforms = stdenv.lib.platforms.linux;
  };
 }